Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3c242e1 authored by Stephen Warren's avatar Stephen Warren Committed by Mark Brown
Browse files

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: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent dd775ae2

drivers/base/regmap/internal.h

+2 −1
Original line number Diff line number Diff line
@@ -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) { }

drivers/base/regmap/regmap-debugfs.c

+11 −3
Original line number Diff line number Diff line
@@ -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)

drivers/base/regmap/regmap.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

include/linux/regmap.h

+5 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ struct reg_default { 
/**

 * 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.

 * @pad_bits: Number of bits of padding between register and value.

 * @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.

 */

struct regmap_config {

	const char *name;



	int reg_bits;

	int pad_bits;

	int val_bits;