diff options
| author | Suman Anna <s-anna@ti.com> | 2020-07-27 16:10:08 -0500 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2020-08-13 07:51:03 +0100 |
| commit | e15d7f2b81d2e7d93115d46fa931b366c1cdebc2 (patch) | |
| tree | 1321f3978ef56b37559acb51a719a02ccc2003cc | |
| parent | 4f4ed4543e2096dc0158ff79bd6d8bc09e27fa93 (diff) | |
| download | prandom-e15d7f2b81d2e7d93115d46fa931b366c1cdebc2.tar.gz | |
mfd: syscon: Use a unique name with regmap_config
The DT node full name is currently being used in regmap_config
which in turn is used to create the regmap debugfs directories.
This name however is not guaranteed to be unique and the regmap
debugfs registration can fail in the cases where the syscon nodes
have the same unit-address but are present in different DT node
hierarchies. Replace this logic using the syscon reg resource
address instead (inspired from logic used while creating platform
devices) to ensure a unique name is given for each syscon.
Signed-off-by: Suman Anna <s-anna@ti.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
| -rw-r--r-- | drivers/mfd/syscon.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c index 3a97816d0cba70..75859e49298411 100644 --- a/drivers/mfd/syscon.c +++ b/drivers/mfd/syscon.c @@ -101,12 +101,14 @@ static struct syscon *of_syscon_register(struct device_node *np, bool check_clk) } } - syscon_config.name = of_node_full_name(np); + syscon_config.name = kasprintf(GFP_KERNEL, "%pOFn@%llx", np, + (u64)res.start); syscon_config.reg_stride = reg_io_width; syscon_config.val_bits = reg_io_width * 8; syscon_config.max_register = resource_size(&res) - reg_io_width; regmap = regmap_init_mmio(NULL, base, &syscon_config); + kfree(syscon_config.name); if (IS_ERR(regmap)) { pr_err("regmap init failed\n"); ret = PTR_ERR(regmap); |