nvmem: add explicit config option to read old syntax fixed OF cells

Binding for fixed NVMEM cells defined directly as NVMEM device subnodes
has been deprecated. It has been replaced by the "fixed-layout" NVMEM
layout binding.

New syntax is meant to be clearer and should help avoiding imprecise
bindings.

NVMEM subsystem already supports the new binding. It should be a good
idea to limit support for old syntax to existing drivers that actually
support & use it (we can't break backward compatibility!). That way we
additionally encourage new bindings & drivers to ignore deprecated
binding.

It wasn't clear (to me) if rtc and w1 code actually uses old syntax
fixed cells. I enabled them to don't risk any breakage.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
[for meson-{efuse,mx-efuse}.c]
Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
[for mtk-efuse.c, nvmem/core.c, nvmem-provider.h]
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
[MT8192, MT8195 Chromebooks]
Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
[for microchip-otpc.c]
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
[SAMA7G5-EK]
Tested-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20231020105545.216052-3-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 9bd661be3ae93d55c70713f5e708e34111737930..fbf60d1364f0dbfd887670f9097fd2df60041baf 100644 (file)
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -552,6 +552,7 @@ static int mtd_nvmem_add(struct mtd_info *mtd)
        config.dev = &mtd->dev;
        config.name = dev_name(&mtd->dev);
        config.owner = THIS_MODULE;
+       config.add_legacy_fixed_of_cells = of_device_is_compatible(node, "nvmem-cells");
        config.reg_read = mtd_nvmem_reg_read;
        config.size = mtd->size;
        config.word_size = 1;
@@ -898,6 +899,7 @@ static struct nvmem_device *mtd_otp_nvmem_register(struct mtd_info *mtd,
        config.name = compatible;
        config.id = NVMEM_DEVID_AUTO;
        config.owner = THIS_MODULE;
+       config.add_legacy_fixed_of_cells = true;
        config.type = NVMEM_TYPE_OTP;
        config.root_only = true;
        config.ignore_wp = true;

diff --git a/drivers/nvmem/apple-efuses.c b/drivers/nvmem/apple-efuses.c
index 9b7c871021043de0c026c56dc915293a5fd15b58..d3d49d22338b3bb9587224f9ec18aff9bf35281c 100644 (file)
--- a/drivers/nvmem/apple-efuses.c
+++ b/drivers/nvmem/apple-efuses.c
@@ -36,6 +36,7 @@ static int apple_efuses_probe(struct platform_device *pdev)
        struct resource *res;
        struct nvmem_config config = {
                .dev = &pdev->dev,
+               .add_legacy_fixed_of_cells = true,
                .read_only = true,
                .reg_read = apple_efuses_read,
                .stride = sizeof(u32),

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index eaf6a3fe8ca6d42ccb6971770e221af9497242e6..2710943f53c448b479bc6ca46794ba21513f0e8a 100644 (file)
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -997,9 +997,11 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
        if (rval)
                goto err_remove_cells;
 
-       rval = nvmem_add_cells_from_legacy_of(nvmem);
-       if (rval)
-               goto err_remove_cells;
+       if (config->add_legacy_fixed_of_cells) {
+               rval = nvmem_add_cells_from_legacy_of(nvmem);
+               if (rval)
+                       goto err_remove_cells;
+       }
 
        rval = nvmem_add_cells_from_fixed_layout(nvmem);
        if (rval)

diff --git a/drivers/nvmem/imx-ocotp-scu.c b/drivers/nvmem/imx-ocotp-scu.c
index c38d9c1c3f486665616693dbe85564fad4c728a6..517d83e11af2c6fcceda30e16111911a2869c3be 100644 (file)
--- a/drivers/nvmem/imx-ocotp-scu.c
+++ b/drivers/nvmem/imx-ocotp-scu.c
@@ -220,6 +220,7 @@ static int imx_scu_ocotp_write(void *context, unsigned int offset,
 
 static struct nvmem_config imx_scu_ocotp_nvmem_config = {
        .name = "imx-scu-ocotp",
+       .add_legacy_fixed_of_cells = true,
        .read_only = false,
        .word_size = 4,
        .stride = 1,

diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c
index a223d9537f224d6b7000a426cc8c00f9828b61fb..434f197e27bfde67d3028ac5924c4862e6fd0f84 100644 (file)
--- a/drivers/nvmem/imx-ocotp.c
+++ b/drivers/nvmem/imx-ocotp.c
@@ -615,6 +615,7 @@ static int imx_ocotp_probe(struct platform_device *pdev)
                return PTR_ERR(priv->clk);
 
        priv->params = of_device_get_match_data(&pdev->dev);
+       imx_ocotp_nvmem_config.add_legacy_fixed_of_cells = true;
        imx_ocotp_nvmem_config.size = 4 * priv->params->nregs;
        imx_ocotp_nvmem_config.dev = dev;
        imx_ocotp_nvmem_config.priv = priv;

diff --git a/drivers/nvmem/meson-efuse.c b/drivers/nvmem/meson-efuse.c
index d6b533497ce1a5334acd6c647e1d87c15cc579af..b922df99f9bc3df457df742123b3c8d970ffa9a5 100644 (file)
--- a/drivers/nvmem/meson-efuse.c
+++ b/drivers/nvmem/meson-efuse.c
@@ -93,6 +93,7 @@ static int meson_efuse_probe(struct platform_device *pdev)
 
        econfig->dev = dev;
        econfig->name = dev_name(dev);
+       econfig->add_legacy_fixed_of_cells = true;
        econfig->stride = 1;
        econfig->word_size = 1;
        econfig->reg_read = meson_efuse_read;

diff --git a/drivers/nvmem/meson-mx-efuse.c b/drivers/nvmem/meson-mx-efuse.c
index d6d7aeda31f92bb3537472588df12a5e5b2ecca4..3ff04d5ca8f8549cdfb45af32078dac31fc15937 100644 (file)
--- a/drivers/nvmem/meson-mx-efuse.c
+++ b/drivers/nvmem/meson-mx-efuse.c
@@ -210,6 +210,7 @@ static int meson_mx_efuse_probe(struct platform_device *pdev)
        efuse->config.owner = THIS_MODULE;
        efuse->config.dev = &pdev->dev;
        efuse->config.priv = efuse;
+       efuse->config.add_legacy_fixed_of_cells = true;
        efuse->config.stride = drvdata->word_size;
        efuse->config.word_size = drvdata->word_size;
        efuse->config.size = SZ_512;

diff --git a/drivers/nvmem/microchip-otpc.c b/drivers/nvmem/microchip-otpc.c
index 436e0dc4f33755cb8d3996da1a5f43e00be67d14..7cf81738a3e0a50500a3460ae57002c61d94ba07 100644 (file)
--- a/drivers/nvmem/microchip-otpc.c
+++ b/drivers/nvmem/microchip-otpc.c
@@ -261,6 +261,7 @@ static int mchp_otpc_probe(struct platform_device *pdev)
                return ret;
 
        mchp_nvmem_config.dev = otpc->dev;
+       mchp_nvmem_config.add_legacy_fixed_of_cells = true;
        mchp_nvmem_config.size = size;
        mchp_nvmem_config.priv = otpc;
        nvmem = devm_nvmem_register(&pdev->dev, &mchp_nvmem_config);

diff --git a/drivers/nvmem/mtk-efuse.c b/drivers/nvmem/mtk-efuse.c
index b36cd0dcc8c7fa5614c9dbb9b49cb99b4125d289..87c94686cfd216ac19ac8cc02cdfc08bc192668e 100644 (file)
--- a/drivers/nvmem/mtk-efuse.c
+++ b/drivers/nvmem/mtk-efuse.c
@@ -83,6 +83,7 @@ static int mtk_efuse_probe(struct platform_device *pdev)
                return PTR_ERR(priv->base);
 
        pdata = device_get_match_data(dev);
+       econfig.add_legacy_fixed_of_cells = true;
        econfig.stride = 1;
        econfig.word_size = 1;
        econfig.reg_read = mtk_reg_read;

diff --git a/drivers/nvmem/qcom-spmi-sdam.c b/drivers/nvmem/qcom-spmi-sdam.c
index 70f2d4f2efbf16202f3dbc97c55683846410e54e..9aa8f42faa4c93532cf8c70ea992a4fbb005d006 100644 (file)
--- a/drivers/nvmem/qcom-spmi-sdam.c
+++ b/drivers/nvmem/qcom-spmi-sdam.c
@@ -142,6 +142,7 @@ static int sdam_probe(struct platform_device *pdev)
        sdam->sdam_config.name = "spmi_sdam";
        sdam->sdam_config.id = NVMEM_DEVID_AUTO;
        sdam->sdam_config.owner = THIS_MODULE;
+       sdam->sdam_config.add_legacy_fixed_of_cells = true;
        sdam->sdam_config.stride = 1;
        sdam->sdam_config.word_size = 1;
        sdam->sdam_config.reg_read = sdam_read;

diff --git a/drivers/nvmem/qfprom.c b/drivers/nvmem/qfprom.c
index 525be03b7bbab9455b8871c5b10795a079a12fb9..116a39e804c70b4a0374f8ea3ac6ba1dd612109d 100644 (file)
--- a/drivers/nvmem/qfprom.c
+++ b/drivers/nvmem/qfprom.c
@@ -357,6 +357,7 @@ static int qfprom_probe(struct platform_device *pdev)
 {
        struct nvmem_config econfig = {
                .name = "qfprom",
+               .add_legacy_fixed_of_cells = true,
                .stride = 1,
                .word_size = 1,
                .id = NVMEM_DEVID_AUTO,

diff --git a/drivers/nvmem/rave-sp-eeprom.c b/drivers/nvmem/rave-sp-eeprom.c
index df6a1c594b78127ef281c6cb99b8f92f28800967..9ecf3873cbb7650389a591c049f4ed8d55fa1018 100644 (file)
--- a/drivers/nvmem/rave-sp-eeprom.c
+++ b/drivers/nvmem/rave-sp-eeprom.c
@@ -328,6 +328,7 @@ static int rave_sp_eeprom_probe(struct platform_device *pdev)
        of_property_read_string(np, "zii,eeprom-name", &config.name);
        config.priv             = eeprom;
        config.dev              = dev;
+       config.add_legacy_fixed_of_cells        = true;
        config.size             = size;
        config.reg_read         = rave_sp_eeprom_reg_read;
        config.reg_write        = rave_sp_eeprom_reg_write;

diff --git a/drivers/nvmem/rockchip-efuse.c b/drivers/nvmem/rockchip-efuse.c
index 4004c5bece423993e6201a25ca4c569183686766..2b40978ddb18cc4071dd28e95b52f808211ec64e 100644 (file)
--- a/drivers/nvmem/rockchip-efuse.c
+++ b/drivers/nvmem/rockchip-efuse.c
@@ -205,6 +205,7 @@ static int rockchip_rk3399_efuse_read(void *context, unsigned int offset,
 
 static struct nvmem_config econfig = {
        .name = "rockchip-efuse",
+       .add_legacy_fixed_of_cells = true,
        .stride = 1,
        .word_size = 1,
        .read_only = true,

diff --git a/drivers/nvmem/sc27xx-efuse.c b/drivers/nvmem/sc27xx-efuse.c
index 2210da40dfbd7b938839220ddb764e40dc2ff3c2..bff27011f4ff28a7eba7e222950e730de37b5cf6 100644 (file)
--- a/drivers/nvmem/sc27xx-efuse.c
+++ b/drivers/nvmem/sc27xx-efuse.c
@@ -247,6 +247,7 @@ static int sc27xx_efuse_probe(struct platform_device *pdev)
        econfig.reg_read = sc27xx_efuse_read;
        econfig.priv = efuse;
        econfig.dev = &pdev->dev;
+       econfig.add_legacy_fixed_of_cells = true;
        nvmem = devm_nvmem_register(&pdev->dev, &econfig);
        if (IS_ERR(nvmem)) {
                dev_err(&pdev->dev, "failed to register nvmem config\n");

diff --git a/drivers/nvmem/sec-qfprom.c b/drivers/nvmem/sec-qfprom.c
index e48c2dc0c44b3953bc43cd08fc41a47d0c2ed5d2..19799b3fe00aad518f734a65f1b0069547b91e7d 100644 (file)
--- a/drivers/nvmem/sec-qfprom.c
+++ b/drivers/nvmem/sec-qfprom.c
@@ -47,6 +47,7 @@ static int sec_qfprom_probe(struct platform_device *pdev)
 {
        struct nvmem_config econfig = {
                .name = "sec-qfprom",
+               .add_legacy_fixed_of_cells = true,
                .stride = 1,
                .word_size = 1,
                .id = NVMEM_DEVID_AUTO,

diff --git a/drivers/nvmem/sprd-efuse.c b/drivers/nvmem/sprd-efuse.c
index 7e6e31db4baaef335f4f84c45d39ea1dcb84a84a..bb3105f3291fcf8ed63d29bb5522ffd787d2bc20 100644 (file)
--- a/drivers/nvmem/sprd-efuse.c
+++ b/drivers/nvmem/sprd-efuse.c
@@ -408,6 +408,7 @@ static int sprd_efuse_probe(struct platform_device *pdev)
        econfig.read_only = false;
        econfig.name = "sprd-efuse";
        econfig.size = efuse->data->blk_nums * SPRD_EFUSE_BLOCK_WIDTH;
+       econfig.add_legacy_fixed_of_cells = true;
        econfig.reg_read = sprd_efuse_read;
        econfig.reg_write = sprd_efuse_write;
        econfig.priv = efuse;

diff --git a/drivers/nvmem/stm32-romem.c b/drivers/nvmem/stm32-romem.c
index 0f84044bd1adef2daff1b58a2107d592569f47f1..1541c20709d25b00c8bbad2f5dbcaa682a5ec4dc 100644 (file)
--- a/drivers/nvmem/stm32-romem.c
+++ b/drivers/nvmem/stm32-romem.c
@@ -207,6 +207,7 @@ static int stm32_romem_probe(struct platform_device *pdev)
        priv->cfg.priv = priv;
        priv->cfg.owner = THIS_MODULE;
        priv->cfg.type = NVMEM_TYPE_OTP;
+       priv->cfg.add_legacy_fixed_of_cells = true;
 
        priv->lower = 0;
 

diff --git a/drivers/nvmem/sunplus-ocotp.c b/drivers/nvmem/sunplus-ocotp.c
index f3a18aa0a6c732ca66e8d20f88b274b9e44e69c9..38f5d9df39cd53ad21fcfa8e58653e400d078b72 100644 (file)
--- a/drivers/nvmem/sunplus-ocotp.c
+++ b/drivers/nvmem/sunplus-ocotp.c
@@ -145,6 +145,7 @@ disable_clk:
 
 static struct nvmem_config sp_ocotp_nvmem_config = {
        .name = "sp-ocotp",
+       .add_legacy_fixed_of_cells = true,
        .read_only = true,
        .word_size = 1,
        .size = QAC628_OTP_SIZE,

diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c
index 5d364d85347fc9f636f68eebd321d36e3ee64edd..ba14a76208ab68349b1ada50f22fd8aca3d03ea8 100644 (file)
--- a/drivers/nvmem/sunxi_sid.c
+++ b/drivers/nvmem/sunxi_sid.c
@@ -153,6 +153,7 @@ static int sunxi_sid_probe(struct platform_device *pdev)
        nvmem_cfg->dev = dev;
        nvmem_cfg->name = "sunxi-sid";
        nvmem_cfg->type = NVMEM_TYPE_OTP;
+       nvmem_cfg->add_legacy_fixed_of_cells = true;
        nvmem_cfg->read_only = true;
        nvmem_cfg->size = cfg->size;
        nvmem_cfg->word_size = 1;

diff --git a/drivers/nvmem/uniphier-efuse.c b/drivers/nvmem/uniphier-efuse.c
index 0a1dbb80537ec1b5288b81ecfa9e6497986a2856..6ad3295d3195112c6ec4539206bbe38dc6f476f5 100644 (file)
--- a/drivers/nvmem/uniphier-efuse.c
+++ b/drivers/nvmem/uniphier-efuse.c
@@ -52,6 +52,7 @@ static int uniphier_efuse_probe(struct platform_device *pdev)
        econfig.size = resource_size(res);
        econfig.priv = priv;
        econfig.dev = dev;
+       econfig.add_legacy_fixed_of_cells = true;
        nvmem = devm_nvmem_register(dev, &econfig);
 
        return PTR_ERR_OR_ZERO(nvmem);

diff --git a/drivers/nvmem/zynqmp_nvmem.c b/drivers/nvmem/zynqmp_nvmem.c
index f49bb9a26d0532307d0ced507b1cbc1044160ef4..7f15aa89a9d09145078c75451a4186f3114b6097 100644 (file)
--- a/drivers/nvmem/zynqmp_nvmem.c
+++ b/drivers/nvmem/zynqmp_nvmem.c
@@ -58,6 +58,7 @@ static int zynqmp_nvmem_probe(struct platform_device *pdev)
 
        priv->dev = dev;
        econfig.dev = dev;
+       econfig.add_legacy_fixed_of_cells = true;
        econfig.reg_read = zynqmp_nvmem_read;
        econfig.priv = priv;
 

diff --git a/drivers/rtc/nvmem.c b/drivers/rtc/nvmem.c
index 07ede21cee347ce08be451293f8f8d9c4f696341..37df7e80525b4a40758d8c291da3f5b4d300eb30 100644 (file)
--- a/drivers/rtc/nvmem.c
+++ b/drivers/rtc/nvmem.c
@@ -21,6 +21,7 @@ int devm_rtc_nvmem_register(struct rtc_device *rtc,
 
        nvmem_config->dev = dev;
        nvmem_config->owner = rtc->owner;
+       nvmem_config->add_legacy_fixed_of_cells = true;
        nvmem = devm_nvmem_register(dev, nvmem_config);
        if (IS_ERR(nvmem))
                dev_err(dev, "failed to register nvmem device for RTC\n");

diff --git a/drivers/w1/slaves/w1_ds250x.c b/drivers/w1/slaves/w1_ds250x.c
index 7592c7050d1d7de19ecad038603acab3f74324f3..cb426f7dd23d441e8fdb799d5f3bb5a731c00d33 100644 (file)
--- a/drivers/w1/slaves/w1_ds250x.c
+++ b/drivers/w1/slaves/w1_ds250x.c
@@ -168,6 +168,7 @@ static int w1_eprom_add_slave(struct w1_slave *sl)
        struct nvmem_device *nvmem;
        struct nvmem_config nvmem_cfg = {
                .dev = &sl->dev,
+               .add_legacy_fixed_of_cells = true,
                .reg_read = w1_nvmem_read,
                .type = NVMEM_TYPE_OTP,
                .read_only = true,

diff --git a/include/linux/nvmem-provider.h b/include/linux/nvmem-provider.h
index dae26295e6bedfcdb81e23f69b2b91d41c580c13..1b81adebdb8beb366faefcd828d75381f12774f0 100644 (file)
--- a/include/linux/nvmem-provider.h
+++ b/include/linux/nvmem-provider.h
@@ -82,6 +82,7 @@ struct nvmem_cell_info {
  * @owner:     Pointer to exporter module. Used for refcounting.
  * @cells:     Optional array of pre-defined NVMEM cells.
  * @ncells:    Number of elements in cells.
+ * @add_legacy_fixed_of_cells: Read fixed NVMEM cells from old OF syntax.
  * @keepout:   Optional array of keepout ranges (sorted ascending by start).
  * @nkeepout:  Number of elements in the keepout array.
  * @type:      Type of the nvmem storage
@@ -112,6 +113,7 @@ struct nvmem_config {
        struct module           *owner;
        const struct nvmem_cell_info    *cells;
        int                     ncells;
+       bool                    add_legacy_fixed_of_cells;
        const struct nvmem_keepout *keepout;
        unsigned int            nkeepout;
        enum nvmem_type         type;