|
@@ -473,9 +473,14 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
|
|
|
nvmem->reg_read = config->reg_read;
|
|
|
nvmem->reg_write = config->reg_write;
|
|
|
nvmem->dev.of_node = config->dev->of_node;
|
|
|
- dev_set_name(&nvmem->dev, "%s%d",
|
|
|
- config->name ? : "nvmem",
|
|
|
- config->name ? config->id : nvmem->id);
|
|
|
+
|
|
|
+ if (config->id == -1 && config->name) {
|
|
|
+ dev_set_name(&nvmem->dev, "%s", config->name);
|
|
|
+ } else {
|
|
|
+ dev_set_name(&nvmem->dev, "%s%d",
|
|
|
+ config->name ? : "nvmem",
|
|
|
+ config->name ? config->id : nvmem->id);
|
|
|
+ }
|
|
|
|
|
|
nvmem->read_only = device_property_present(config->dev, "read-only") |
|
|
|
config->read_only;
|