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.
Unified · Split
| @@ -101,12 +101,14 @@ static struct syscon *of_syscon_register(struct device_node *np, bool check_clk) · 100 unmodified lines | ||
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | 103 | |
| 104 | − syscon_config.name = of_node_full_name(np); | |
| 104 | + syscon_config.name = kasprintf(GFP_KERNEL, "%pOFn@%llx", np, | |
| 105 | + (u64)res.start); | |
| 105 | 106 | syscon_config.reg_stride = reg_io_width; |
| 106 | 107 | syscon_config.val_bits = reg_io_width * 8; |
| 107 | 108 | syscon_config.max_register = resource_size(&res) - reg_io_width; |
| 108 | 109 | |
| 109 | 110 | regmap = regmap_init_mmio(NULL, base, &syscon_config); |
| 111 | + kfree(syscon_config.name); | |
| 110 | 112 | if (IS_ERR(regmap)) { |
| 111 | 113 | pr_err("regmap init failed\n"); |
| 112 | 114 | ret = PTR_ERR(regmap); |