1 From 943eadbdb11314b41eacbcc484dfb7f93e271ff4 Mon Sep 17 00:00:00 2001
2 From: Sean Anderson <sean.anderson@seco.com>
3 Date: Fri, 29 Apr 2022 17:27:00 +0100
4 Subject: [PATCH] nvmem: sfp: Use regmap
6 This converts the SFP driver to use regmap. This will allow easily
7 supporting devices with different endians. We disallow byte-level
8 access, as regmap_bulk_read doesn't support it (and it's unclear what
9 the correct result would be when we have an endianness difference).
11 Signed-off-by: Sean Anderson <sean.anderson@seco.com>
12 Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
13 Link: https://lore.kernel.org/r/20220429162701.2222-16-srinivas.kandagatla@linaro.org
14 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
16 drivers/nvmem/Kconfig | 1 +
17 drivers/nvmem/layerscape-sfp.c | 30 ++++++++++++++++++++++--------
18 2 files changed, 23 insertions(+), 8 deletions(-)
20 --- a/drivers/nvmem/Kconfig
21 +++ b/drivers/nvmem/Kconfig
22 @@ -304,6 +304,7 @@ config NVMEM_LAYERSCAPE_SFP
23 tristate "Layerscape SFP (Security Fuse Processor) support"
24 depends on ARCH_LAYERSCAPE || COMPILE_TEST
28 This driver provides support to read the eFuses on Freescale
29 Layerscape SoC's. For example, the vendor provides a per part
30 --- a/drivers/nvmem/layerscape-sfp.c
31 +++ b/drivers/nvmem/layerscape-sfp.c
33 #include <linux/nvmem-provider.h>
34 #include <linux/platform_device.h>
35 #include <linux/property.h>
36 +#include <linux/regmap.h>
38 #define LAYERSCAPE_SFP_OTP_OFFSET 0x0200
40 struct layerscape_sfp_priv {
42 + struct regmap *regmap;
45 struct layerscape_sfp_data {
47 + enum regmap_endian endian;
50 static int layerscape_sfp_read(void *context, unsigned int offset, void *val,
51 @@ -29,15 +31,16 @@ static int layerscape_sfp_read(void *con
53 struct layerscape_sfp_priv *priv = context;
55 - memcpy_fromio(val, priv->base + LAYERSCAPE_SFP_OTP_OFFSET + offset,
59 + return regmap_bulk_read(priv->regmap,
60 + LAYERSCAPE_SFP_OTP_OFFSET + offset, val,
64 static struct nvmem_config layerscape_sfp_nvmem_config = {
66 .reg_read = layerscape_sfp_read,
71 static int layerscape_sfp_probe(struct platform_device *pdev)
72 @@ -45,16 +48,26 @@ static int layerscape_sfp_probe(struct p
73 const struct layerscape_sfp_data *data;
74 struct layerscape_sfp_priv *priv;
75 struct nvmem_device *nvmem;
76 + struct regmap_config config = { 0 };
79 priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
83 - priv->base = devm_platform_ioremap_resource(pdev, 0);
84 - if (IS_ERR(priv->base))
85 - return PTR_ERR(priv->base);
86 + base = devm_platform_ioremap_resource(pdev, 0);
88 + return PTR_ERR(base);
90 data = device_get_match_data(&pdev->dev);
91 + config.reg_bits = 32;
92 + config.reg_stride = 4;
93 + config.val_bits = 32;
94 + config.val_format_endian = data->endian;
95 + config.max_register = LAYERSCAPE_SFP_OTP_OFFSET + data->size - 4;
96 + priv->regmap = devm_regmap_init_mmio(&pdev->dev, base, &config);
97 + if (IS_ERR(priv->regmap))
98 + return PTR_ERR(priv->regmap);
100 layerscape_sfp_nvmem_config.size = data->size;
101 layerscape_sfp_nvmem_config.dev = &pdev->dev;
102 @@ -67,6 +80,7 @@ static int layerscape_sfp_probe(struct p
104 static const struct layerscape_sfp_data ls1028a_data = {
106 + .endian = REGMAP_ENDIAN_LITTLE,
109 static const struct of_device_id layerscape_sfp_dt_ids[] = {