From patchwork Sun Apr 24 19:28:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 66537 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp696448qge; Sun, 24 Apr 2016 12:29:19 -0700 (PDT) X-Received: by 10.66.25.133 with SMTP id c5mr42297979pag.104.1461526159199; Sun, 24 Apr 2016 12:29:19 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 127si1678202pfe.224.2016.04.24.12.29.18; Sun, 24 Apr 2016 12:29:19 -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 S1753316AbcDXT3M (ORCPT + 29 others); Sun, 24 Apr 2016 15:29:12 -0400 Received: from mail-wm0-f54.google.com ([74.125.82.54]:35113 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753200AbcDXT2s (ORCPT ); Sun, 24 Apr 2016 15:28:48 -0400 Received: by mail-wm0-f54.google.com with SMTP id e201so65593982wme.0 for ; Sun, 24 Apr 2016 12:28:47 -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=L3WAB2exU+HuFLNrj2UQJ5JHzsuJzaE1ur40SWxO2Kk=; b=MUxHKSK4Pi5oSCIOAGv9htH6BMWc2V/Y1uWsmbrnuzvYDQ/RqEBpyfrmbTeQOj7TDj FbRHf9MN6Xn7Upo4P/0l9f7Dw/z8HaXHldzvDssrJEL0usnYP0kIU7mEoy1xUskZqxrS qVkhqlBXJJPvTM/WAS4EuvaXf8EsIlmVvQTLg= 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=L3WAB2exU+HuFLNrj2UQJ5JHzsuJzaE1ur40SWxO2Kk=; b=NZuLCkBxY4+ZJMfh5YmN2G6KPLhYY3oSWQvJ+3agG8R/H1HfNzl5+Ns1S6ckMKMv5m ayZGTE7o356Qh1yr5sWnkBSIV2JuhI7L0oDez58LZOQuzxeZCko5XuXfTRDZot+5fcgN a8ZiWt/3EL93FQuvGTZR2URGzvsLCyuAym6rM9z1CKWuAJRJP7OP1Tn/BoTm8WEQc2O9 S/GMMYsn2D6JZjJq8M0QUK5pCJuXlYXnfdzQezJe34WcIdDsD1rj5/G5ZNrTYqn9ZzTi n59dds/RO5KcS5mxHawUn95xIUuE78M1oecK69Eoe7ODBuM+X1wZm8IT1wsOUwDWTcGo rzzQ== X-Gm-Message-State: AOPr4FVYyShbyCj5WBoM/+LmM1bviYb1T/4TOu2KrpOGvf7/fg1aW/dlbkWuEDuC7P++chCN X-Received: by 10.194.10.162 with SMTP id j2mr11951872wjb.72.1461526126963; Sun, 24 Apr 2016 12:28:46 -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.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 24 Apr 2016 12:28:46 -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 11/12] nvmem: mxs-ocotp: remove nvmem regmap dependency Date: Sun, 24 Apr 2016 20:28:15 +0100 Message-Id: <1461526096-29584-12-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/mxs-ocotp.c | 79 +++++++++++++---------------------------------- 1 file changed, 21 insertions(+), 58 deletions(-) -- 2.5.0 diff --git a/drivers/nvmem/mxs-ocotp.c b/drivers/nvmem/mxs-ocotp.c index 8ba19bb..3bf962c 100644 --- a/drivers/nvmem/mxs-ocotp.c +++ b/drivers/nvmem/mxs-ocotp.c @@ -66,11 +66,10 @@ static int mxs_ocotp_wait(struct mxs_ocotp *otp) return 0; } -static int mxs_ocotp_read(void *context, const void *reg, size_t reg_size, - void *val, size_t val_size) +static int mxs_ocotp_read(void *context, unsigned int offset, + void *val, size_t bytes) { struct mxs_ocotp *otp = context; - unsigned int offset = *(u32 *)reg; u32 *buf = val; int ret; @@ -94,17 +93,16 @@ static int mxs_ocotp_read(void *context, const void *reg, size_t reg_size, if (ret) goto close_banks; - while (val_size) { + while (bytes) { if ((offset < OCOTP_DATA_OFFSET) || (offset % 16)) { /* fill up non-data register */ - *buf = 0; + *buf++ = 0; } else { - *buf = readl(otp->base + offset); + *buf++ = readl(otp->base + offset); } - buf++; - val_size--; - offset += reg_size; + bytes -= 4; + offset += 4; } close_banks: @@ -117,57 +115,28 @@ disable_clk: return ret; } -static int mxs_ocotp_write(void *context, const void *data, size_t count) -{ - /* We don't want to support writing */ - return 0; -} - -static bool mxs_ocotp_writeable_reg(struct device *dev, unsigned int reg) -{ - return false; -} - static struct nvmem_config ocotp_config = { .name = "mxs-ocotp", + .stride = 16, + .word_size = 4, .owner = THIS_MODULE, }; -static const struct regmap_range imx23_ranges[] = { - regmap_reg_range(OCOTP_DATA_OFFSET, 0x210), -}; - -static const struct regmap_access_table imx23_access = { - .yes_ranges = imx23_ranges, - .n_yes_ranges = ARRAY_SIZE(imx23_ranges), -}; - -static const struct regmap_range imx28_ranges[] = { - regmap_reg_range(OCOTP_DATA_OFFSET, 0x290), -}; - -static const struct regmap_access_table imx28_access = { - .yes_ranges = imx28_ranges, - .n_yes_ranges = ARRAY_SIZE(imx28_ranges), +struct imx_data { + int max_reg; }; -static struct regmap_bus mxs_ocotp_bus = { - .read = mxs_ocotp_read, - .write = mxs_ocotp_write, /* make regmap_init() happy */ - .reg_format_endian_default = REGMAP_ENDIAN_NATIVE, - .val_format_endian_default = REGMAP_ENDIAN_NATIVE, +static const struct imx_data imx23_data = { + .max_reg = 0x210, }; -static struct regmap_config mxs_ocotp_config = { - .reg_bits = 32, - .val_bits = 32, - .reg_stride = 16, - .writeable_reg = mxs_ocotp_writeable_reg, +static const struct imx_data imx28_data = { + .max_reg = 0x290, }; static const struct of_device_id mxs_ocotp_match[] = { - { .compatible = "fsl,imx23-ocotp", .data = &imx23_access }, - { .compatible = "fsl,imx28-ocotp", .data = &imx28_access }, + { .compatible = "fsl,imx23-ocotp", .data = &imx23_data }, + { .compatible = "fsl,imx28-ocotp", .data = &imx23_data }, { /* sentinel */}, }; MODULE_DEVICE_TABLE(of, mxs_ocotp_match); @@ -175,6 +144,7 @@ MODULE_DEVICE_TABLE(of, mxs_ocotp_match); static int mxs_ocotp_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; + struct imx_data *data; struct mxs_ocotp *otp; struct resource *res; const struct of_device_id *match; @@ -205,17 +175,10 @@ static int mxs_ocotp_probe(struct platform_device *pdev) return ret; } - access = match->data; - mxs_ocotp_config.rd_table = access; - mxs_ocotp_config.max_register = access->yes_ranges[0].range_max; - - regmap = devm_regmap_init(dev, &mxs_ocotp_bus, otp, &mxs_ocotp_config); - if (IS_ERR(regmap)) { - dev_err(dev, "regmap init failed\n"); - ret = PTR_ERR(regmap); - goto err_clk; - } + data = match->data; + ocotp_config.size = data->max_reg; + ocotp_config.priv = otp; ocotp_config.dev = dev; otp->nvmem = nvmem_register(&ocotp_config); if (IS_ERR(otp->nvmem)) {