regmap: allow regmap instances to be named

Some devices have multiple separate register regions. Logically, one
regmap would be created per region. One issue that prevents this is that
each instance will attempt to create the same debugfs files. Avoid this
by allowing regmaps to be named, and use the name to construct the
debugfs directory name.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

3 files changed, 15 insertions, 6 deletions

diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
index fcafc5b2e651..6beef6691c47 100644
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -41,6 +41,7 @@ struct regmap {
 
 #ifdef CONFIG_DEBUG_FS
         struct dentry *debugfs;
+        const char *debugfs_name;
 #endif
 
         unsigned int max_register;
@@ -101,7 +102,7 @@ int _regmap_write(struct regmap *map, unsigned int reg,
 
 #ifdef CONFIG_DEBUG_FS
 extern void regmap_debugfs_initcall(void);
-extern void regmap_debugfs_init(struct regmap *map);
+extern void regmap_debugfs_init(struct regmap *map, const char *name);
 extern void regmap_debugfs_exit(struct regmap *map);
 #else
 static inline void regmap_debugfs_initcall(void) { }
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c
index 58517a5dac13..9715e8e44506 100644
--- a/drivers/base/regmap/regmap-debugfs.c
+++ b/drivers/base/regmap/regmap-debugfs.c
@@ -248,10 +248,17 @@ static const struct file_operations regmap_access_fops = {
         .llseek = default_llseek,
 };
 
-void regmap_debugfs_init(struct regmap *map)
+void regmap_debugfs_init(struct regmap *map, const char *name)
 {
-        map->debugfs = debugfs_create_dir(dev_name(map->dev),
-                                          regmap_debugfs_root);
+        if (name) {
+                map->debugfs_name = kasprintf(GFP_KERNEL, "%s-%s",
+                                              dev_name(map->dev), name);
+                name = map->debugfs_name;
+        } else {
+                name = dev_name(map->dev);
+        }
+
+        map->debugfs = debugfs_create_dir(name, regmap_debugfs_root);
         if (!map->debugfs) {
                 dev_warn(map->dev, "Failed to create debugfs directory\n");
                 return;
@@ -280,6 +287,7 @@ void regmap_debugfs_init(struct regmap *map)
 void regmap_debugfs_exit(struct regmap *map)
 {
         debugfs_remove_recursive(map->debugfs);
+        kfree(map->debugfs_name);
 }
 
 void regmap_debugfs_initcall(void)
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 7a3f535e481c..b1dad1f9c47d 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -289,7 +289,7 @@ struct regmap *regmap_init(struct device *dev,
                 goto err_map;
         }
 
-        regmap_debugfs_init(map);
+        regmap_debugfs_init(map, config->name);
 
         ret = regcache_init(map, config);
         if (ret < 0)
@@ -372,7 +372,7 @@ int regmap_reinit_cache(struct regmap *map, const struct regmap_config *config)
         map->precious_reg = config->precious_reg;
         map->cache_type = config->cache_type;
 
-        regmap_debugfs_init(map);
+        regmap_debugfs_init(map, config->name);
 
         map->cache_bypass = false;
         map->cache_only = false;