Right now the core implementation always make use of DEVICE_ID_DYNAMIC.
This does not allow us having static devices supplied via the of-aliases
node. Therefore sync the code base with Linux to allow single ids,
albeit the id handling is still different.
While on it fix the nvmem_register_cdev() by using the dev_name() which
honors the DEVICE_ID_* cases else we end up with different names for the
devfs and the device itself.
Signed-off-by: Marco Felsch <m.felsch@xxxxxxxxxxxxxx>
---
drivers/nvmem/core.c | 16 +++++++++++-----
include/linux/nvmem-provider.h | 4 ++++
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 7d795d5873dc..c5ed1ce962dd 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -421,10 +421,16 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
if (config->read_only || !config->reg_write || of_property_read_bool(np, "read-only"))
nvmem->read_only = true;
- dev_set_name(&nvmem->dev, config->name);
- nvmem->dev.id = DEVICE_ID_DYNAMIC;
-
- dev_dbg(nvmem->dev.parent, "Registering nvmem device %s\n", config->name);
+ dev_set_name(&nvmem->dev, config->name ? : "nvmem");
+ switch (config->id) {
+ case NVMEM_DEVID_NONE:
+ nvmem->dev.id = DEVICE_ID_SINGLE;
+ break;
+ case NVMEM_DEVID_AUTO:
+ default:
+ nvmem->dev.id = DEVICE_ID_DYNAMIC;
+ break;
+ }
rval = register_device(&nvmem->dev);
if (rval) {
@@ -433,7 +439,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
}
if (!config->cdev) {
- rval = nvmem_register_cdev(nvmem, config->name);
+ rval = nvmem_register_cdev(nvmem, dev_name(&nvmem->dev));
if (rval) {
kfree(nvmem);
return ERR_PTR(rval);
diff --git a/include/linux/nvmem-provider.h b/include/linux/nvmem-provider.h
index ccac60696a28..33db9ba53d35 100644
--- a/include/linux/nvmem-provider.h
+++ b/include/linux/nvmem-provider.h
@@ -17,6 +17,9 @@
struct nvmem_device;
+#define NVMEM_DEVID_NONE (-1)
+#define NVMEM_DEVID_AUTO (-2)
+
/**
* struct nvmem_cell_info - NVMEM cell description
* @name: Name.
@@ -47,6 +50,7 @@ typedef int (*nvmem_cell_post_process_t)(void *priv, const char *id,
struct nvmem_config {
struct device *dev;
const char *name;
+ int id;
bool read_only;
struct cdev *cdev;
int stride;
--
2.39.2
