nvmem: core: add support to auto devid

For nvmem providers which have multiple instances, it is required
to suffix the provider name with proper id, so that they do not
confict for the same name. Currently the core does not handle
this case properly eventhough core already has logic to generate the id.

This patch add new devid type NVMEM_DEVID_AUTO for providers to be
able to allow core to assign id and append it to provier name.

Reported-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Link: https://lore.kernel.org/r/20200722100705.7772-8-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index d6bacc8785009f74523a2c52226545dfa91630cd..6cd3edb2eaf65feebcadf4f4cfce40a22e355eaf 100644 (file)
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -635,12 +635,18 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
        if (!config->no_of_node)
                nvmem->dev.of_node = config->dev->of_node;
 
-       if (config->id == -1 && config->name) {
+       switch (config->id) {
+       case NVMEM_DEVID_NONE:
                dev_set_name(&nvmem->dev, "%s", config->name);
-       } else {
+               break;
+       case NVMEM_DEVID_AUTO:
+               dev_set_name(&nvmem->dev, "%s%d", config->name, nvmem->id);
+               break;
+       default:
                dev_set_name(&nvmem->dev, "%s%d",
                             config->name ? : "nvmem",
                             config->name ? config->id : nvmem->id);
+               break;
        }
 
        nvmem->read_only = device_property_present(config->dev, "read-only") ||

diff --git a/include/linux/nvmem-provider.h b/include/linux/nvmem-provider.h
index 6d6f8e5d24c97ca71bf7863fdf98c3bdb0ee9a2b..06409a6c40bcb2a0ca7e8ba9408fce159b0d9b6a 100644 (file)
--- a/include/linux/nvmem-provider.h
+++ b/include/linux/nvmem-provider.h
@@ -27,6 +27,9 @@ enum nvmem_type {
        NVMEM_TYPE_BATTERY_BACKED,
 };
 
+#define NVMEM_DEVID_NONE       (-1)
+#define NVMEM_DEVID_AUTO       (-2)
+
 /**
  * struct nvmem_config - NVMEM device configuration
  *