From patchwork Sun Apr 24 19:28:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 66539 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp696635qge; Sun, 24 Apr 2016 12:29:56 -0700 (PDT) X-Received: by 10.98.13.77 with SMTP id v74mr43844219pfi.162.1461526196898; Sun, 24 Apr 2016 12:29:56 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u128si1681895pfb.89.2016.04.24.12.29.56; Sun, 24 Apr 2016 12:29:56 -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 S1753360AbcDXT3k (ORCPT + 29 others); Sun, 24 Apr 2016 15:29:40 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:35099 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753231AbcDXT2o (ORCPT ); Sun, 24 Apr 2016 15:28:44 -0400 Received: by mail-wm0-f49.google.com with SMTP id e201so65593083wme.0 for ; Sun, 24 Apr 2016 12:28:43 -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=RYlaPRn9Hc/Qkv9K2kP+YtzjL2ttq/5eveFPDbYdX5o=; b=L5brmO/urTHuVs9WQkalxQvu+zDhaOB0uSdGQY/0K+fd89s7uO9JQKApOJWxuwKHBZ 3ShEc46S4t+H3r7RycN/YNd0zuPGEKsWTItwDN6u4IScQbPuVxMO8PlW3zg+aXWUm/vN PaQ4Q5V2P0M2fCwA8oqR1ceEu3G0JFL9EVsIw= 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=RYlaPRn9Hc/Qkv9K2kP+YtzjL2ttq/5eveFPDbYdX5o=; b=XVaal0sQO7agpZYFbdFj8678PvHgElWyvIalNjRMDGASgYboa8Tysj0g2N9fj47izV 1ylCGXdA/67FWyjISwbeayzlfxxYG4XT0ybtQyW9+lWbGAORYB86OPNBOslPJGx58i9z iJdUEjN0eynK8GVE50CZq4PxvQvHLGG29JfEnsQ/a5b6Tc+sMOR8IBzs6FPc8UTMHikK TDXOEVs4VXK6W7oZIopduwgj8K2CCh28OqSfDhuaH94k2l4yDT8my/xuuiLSGoDeBpKg yDFjUemV/ioImsk3GvHyayFhP/BBegpkAJYKVfeKautaLa7+DJBFXg/kg9QEuwf+Dvt6 YuLw== X-Gm-Message-State: AOPr4FWKcY5bp67Q2kmkC6XXd20lLbhv05cV60+zAQh80OiQzZmD01XwXtlsZca3Y58bewpx X-Received: by 10.194.113.3 with SMTP id iu3mr35239297wjb.149.1461526123121; Sun, 24 Apr 2016 12:28:43 -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.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 24 Apr 2016 12:28:42 -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 08/12] nvmem: mtk-efuse: remove nvmem regmap dependency Date: Sun, 24 Apr 2016 20:28:12 +0100 Message-Id: <1461526096-29584-9-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. Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/Kconfig | 1 - drivers/nvmem/mtk-efuse.c | 47 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 32 insertions(+), 16 deletions(-) -- 2.5.0 diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig index 377bc21..c158712 100644 --- a/drivers/nvmem/Kconfig +++ b/drivers/nvmem/Kconfig @@ -48,7 +48,6 @@ config NVMEM_MXS_OCOTP config MTK_EFUSE tristate "Mediatek SoCs EFUSE support" depends on ARCH_MEDIATEK || COMPILE_TEST - select REGMAP_MMIO help This is a driver to access hardware related data like sensor calibration, HDMI impedance etc. diff --git a/drivers/nvmem/mtk-efuse.c b/drivers/nvmem/mtk-efuse.c index 9c49369..32fd572 100644 --- a/drivers/nvmem/mtk-efuse.c +++ b/drivers/nvmem/mtk-efuse.c @@ -14,15 +14,35 @@ #include #include +#include #include #include -#include -static struct regmap_config mtk_regmap_config = { - .reg_bits = 32, - .val_bits = 32, - .reg_stride = 4, -}; +static int mtk_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; + + while (words--) + *val++ = readl(base + reg + (i++ * 4)); + + return 0; +} + +static int mtk_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 mtk_efuse_probe(struct platform_device *pdev) { @@ -30,7 +50,6 @@ static int mtk_efuse_probe(struct platform_device *pdev) struct resource *res; struct nvmem_device *nvmem; struct nvmem_config *econfig; - struct regmap *regmap; void __iomem *base; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -42,14 +61,12 @@ static int mtk_efuse_probe(struct platform_device *pdev) if (!econfig) return -ENOMEM; - mtk_regmap_config.max_register = resource_size(res) - 1; - - regmap = devm_regmap_init_mmio(dev, base, &mtk_regmap_config); - if (IS_ERR(regmap)) { - dev_err(dev, "regmap init failed\n"); - return PTR_ERR(regmap); - } - + econfig->stride = 4; + econfig->word_size = 4; + econfig->reg_read = mtk_reg_read; + econfig->reg_write = mtk_reg_write; + econfig->size = resource_size(res); + econfig->priv = base; econfig->dev = dev; econfig->owner = THIS_MODULE; nvmem = nvmem_register(econfig);