From patchwork Sun Apr 24 19:28:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 66534 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp696384qge; Sun, 24 Apr 2016 12:29:04 -0700 (PDT) X-Received: by 10.66.132.37 with SMTP id or5mr43643889pab.144.1461526144467; Sun, 24 Apr 2016 12:29:04 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l24si6328273pfb.246.2016.04.24.12.29.04; Sun, 24 Apr 2016 12:29:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753250AbcDXT2p (ORCPT + 29 others); Sun, 24 Apr 2016 15:28:45 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:36095 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753200AbcDXT2j (ORCPT ); Sun, 24 Apr 2016 15:28:39 -0400 Received: by mail-wm0-f44.google.com with SMTP id v188so75426099wme.1 for ; Sun, 24 Apr 2016 12:28:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nslTc8ro1kARUVb3biH6Mc8mD3YVNLySbLRYpSAzPeU=; b=kGmoK+jmTHp8mFVCbY5Ygfr9sMvw8nIo0RADyLsfJ6ej6Jy16Zh1bTnuE816ZvmsVK 1eLCV5ZHZdITVslSXxm+WDW78D7CEFfcKHj20JthLu66oAJEi3YBJpHbLl/8yCT1n8nU vH0CYBavLJXWUs+Hq6QL9uDbGYeixZLxbOB70= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nslTc8ro1kARUVb3biH6Mc8mD3YVNLySbLRYpSAzPeU=; b=izCoc8IMAxvSRyCnmLHE2CulZuI1zhXfn2Xl1exeFm/qWoI5qdTrApFsMAEETpT1Yb szQu+QutXtiuB4XoupB7yJaoEwJpjjO0lRqXPx+NrRnDvh57RIkbXqm7frXhpkJmd67I nyY+AgknF8cz8yNTJP2GWg/4y5NVuq5IwZ/T4eH0d1Jilt40+2E8OFpvVIKMYWsRGqR9 mzzWFtaRl4dLfD47zJun4h+yU3aXNyk+TGrHMXWCj6gp0JxUO39AFax+NduA8pbjcHXB 5eD3qauj+g2KtbPYX1AIBVfsxkH0m6xX02RON3iD4ja5sLj7mQMeMG7On1z2iyPxK6VK BMoA== X-Gm-Message-State: AOPr4FX7bhCTNaGBbd8FAj1KkOPaKRESdmahJogES8hTMLAMzd4aHckP2XKoYe27LqpVeHU3 X-Received: by 10.28.145.67 with SMTP id t64mr8545344wmd.56.1461526117929; Sun, 24 Apr 2016 12:28:37 -0700 (PDT) Received: from localhost.localdomain (host-92-17-247-99.as13285.net. [92.17.247.99]) by smtp.gmail.com with ESMTPSA id q127sm15007708wmd.13.2016.04.24.12.28.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 24 Apr 2016 12:28:37 -0700 (PDT) From: Srinivas Kandagatla To: Greg Kroah-Hartman Cc: Wolfram Sang , Srinivas Kandagatla , Maxime Ripard , Joachim Eastwood , Matthias Brugger , Heiko Stuebner , Chen-Yu Tsai , linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-rockchip@lists.infradead.org, Mark Brown , andrew@lunn.ch Subject: [PATCH 04/12] nvmem: qfprom: remove nvmem regmap dependency Date: Sun, 24 Apr 2016 20:28:08 +0100 Message-Id: <1461526096-29584-5-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1461526096-29584-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1461526096-29584-1-git-send-email-srinivas.kandagatla@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch moves to nvmem support in the driver to use callback instead of regmap. Reported-by: Rajendra Nayak Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/Kconfig | 1 - drivers/nvmem/qfprom.c | 56 +++++++++++++++++++++++++++++++++----------------- 2 files changed, 37 insertions(+), 20 deletions(-) -- 2.5.0 diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig index 36f4f4b..a87273b 100644 --- a/drivers/nvmem/Kconfig +++ b/drivers/nvmem/Kconfig @@ -60,7 +60,6 @@ config QCOM_QFPROM tristate "QCOM QFPROM Support" depends on ARCH_QCOM || COMPILE_TEST depends on HAS_IOMEM - select REGMAP_MMIO help Say y here to enable QFPROM support. The QFPROM provides access functions for QFPROM data to rest of the drivers via nvmem interface. diff --git a/drivers/nvmem/qfprom.c b/drivers/nvmem/qfprom.c index 3829e5f..b5305f0 100644 --- a/drivers/nvmem/qfprom.c +++ b/drivers/nvmem/qfprom.c @@ -13,21 +13,35 @@ #include #include +#include #include #include -#include -static struct regmap_config qfprom_regmap_config = { - .reg_bits = 32, - .val_bits = 8, - .reg_stride = 1, - .val_format_endian = REGMAP_ENDIAN_LITTLE, -}; +static int qfprom_reg_read(void *context, + unsigned int reg, void *_val, size_t bytes) +{ + void __iomem *base = context; + u32 *val = _val; + int i = 0, words = bytes / 4; -static struct nvmem_config econfig = { - .name = "qfprom", - .owner = THIS_MODULE, -}; + while (words--) + *val++ = readl(base + reg + (i++ * 4)); + + return 0; +} + +static int qfprom_reg_write(void *context, + unsigned int reg, void *_val, size_t bytes) +{ + void __iomem *base = context; + u32 *val = _val; + int i = 0, words = bytes / 4; + + while (words--) + writel(*val++, base + reg + (i++ * 4)); + + return 0; +} static int qfprom_remove(struct platform_device *pdev) { @@ -36,12 +50,20 @@ static int qfprom_remove(struct platform_device *pdev) return nvmem_unregister(nvmem); } +static struct nvmem_config econfig = { + .name = "qfprom", + .owner = THIS_MODULE, + .stride = 4, + .word_size = 1, + .reg_read = qfprom_reg_read, + .reg_write = qfprom_reg_write, +}; + static int qfprom_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct resource *res; struct nvmem_device *nvmem; - struct regmap *regmap; void __iomem *base; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -49,14 +71,10 @@ static int qfprom_probe(struct platform_device *pdev) if (IS_ERR(base)) return PTR_ERR(base); - qfprom_regmap_config.max_register = resource_size(res) - 1; - - regmap = devm_regmap_init_mmio(dev, base, &qfprom_regmap_config); - if (IS_ERR(regmap)) { - dev_err(dev, "regmap init failed\n"); - return PTR_ERR(regmap); - } + econfig.size = resource_size(res); econfig.dev = dev; + econfig.priv = base; + nvmem = nvmem_register(&econfig); if (IS_ERR(nvmem)) return PTR_ERR(nvmem);