UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Stephen Warren 2012-04-04 15:48:29 -06:00 committed by Mark Brown
parent dd775ae254
commit d3c242e1f2
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/base/regmap/internal.h
View File

@ -41,6 +41,7 @@ struct regmap {
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
struct dentry *debugfs; struct dentry *debugfs;
const char *debugfs_name;
#endif #endif
unsigned int max_register; unsigned int max_register;
@ -101,7 +102,7 @@ int _regmap_write(struct regmap *map, unsigned int reg,
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
extern void regmap_debugfs_initcall(void); 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); extern void regmap_debugfs_exit(struct regmap *map);
#else #else
static inline void regmap_debugfs_initcall(void) { } static inline void regmap_debugfs_initcall(void) { }

14
drivers/base/regmap/regmap-debugfs.c
View File

@ -248,10 +248,17 @@ static const struct file_operations regmap_access_fops = {
.llseek = default_llseek, .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), if (name) {
regmap_debugfs_root); 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) { if (!map->debugfs) {
dev_warn(map->dev, "Failed to create debugfs directory\n"); dev_warn(map->dev, "Failed to create debugfs directory\n");
return; return;
@ -280,6 +287,7 @@ void regmap_debugfs_init(struct regmap *map)
void regmap_debugfs_exit(struct regmap *map) void regmap_debugfs_exit(struct regmap *map)
{ {
debugfs_remove_recursive(map->debugfs); debugfs_remove_recursive(map->debugfs);
kfree(map->debugfs_name);
} }
void regmap_debugfs_initcall(void) void regmap_debugfs_initcall(void)

4
drivers/base/regmap/regmap.c
View File

@ -289,7 +289,7 @@ struct regmap *regmap_init(struct device *dev,
goto err_map; goto err_map;
} }
regmap_debugfs_init(map); regmap_debugfs_init(map, config->name);
ret = regcache_init(map, config); ret = regcache_init(map, config);
if (ret < 0) 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->precious_reg = config->precious_reg;
map->cache_type = config->cache_type; map->cache_type = config->cache_type;
regmap_debugfs_init(map); regmap_debugfs_init(map, config->name);
map->cache_bypass = false; map->cache_bypass = false;
map->cache_only = false; map->cache_only = false;

5
include/linux/regmap.h
View File

@ -46,6 +46,9 @@ struct reg_default {
/** /**
* Configuration for the register map of a device. * Configuration for the register map of a device.
* *
* @name: Optional name of the regmap. Useful when a device has multiple
* register regions.
*
* @reg_bits: Number of bits in a register address, mandatory. * @reg_bits: Number of bits in a register address, mandatory.
* @pad_bits: Number of bits of padding between register and value. * @pad_bits: Number of bits of padding between register and value.
* @val_bits: Number of bits in a register value, mandatory. * @val_bits: Number of bits in a register value, mandatory.
@ -77,6 +80,8 @@ struct reg_default {
* @num_reg_defaults_raw: Number of elements in reg_defaults_raw. * @num_reg_defaults_raw: Number of elements in reg_defaults_raw.
*/ */
struct regmap_config { struct regmap_config {
const char *name;
int reg_bits; int reg_bits;
int pad_bits; int pad_bits;
int val_bits; int val_bits;