Preston_PLB
/
kernel-aes67
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mux: mmio: use reg property when parent device is not a syscon 

The DT binding for the reg-mux compatible states it can be used when the
"parent device of mux controller is not syscon device". It also allows
for a reg property. When the reg property is provided, use that to
identify the address space for this mux. If not provided fallback to
using the parent device as a regmap provider.

While here use dev_err_probe() in the error path to prevent printing
a message on probe defer which now can happen in extra ways.

Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Nishanth Menon <nm@ti.com>
Acked-by: Peter Rosin <peda@axentia.se>
Link: https://lore.kernel.org/r/20240104154552.17852-1-afd@ti.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andrew Davis 2024-01-04 09:45:52 -06:00 committed by Greg Kroah-Hartman
parent b1b9f7a494
commit 2765149273
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/mux/mmio.c
View File

@ -44,15 +44,20 @@ static int mux_mmio_probe(struct platform_device *pdev)
int ret; int ret;
int i; int i;
if (of_device_is_compatible(np, "mmio-mux")) if (of_device_is_compatible(np, "mmio-mux")) {
regmap = syscon_node_to_regmap(np->parent); regmap = syscon_node_to_regmap(np->parent);
else } else {
regmap = dev_get_regmap(dev->parent, NULL) ?: ERR_PTR(-ENODEV); regmap = device_node_to_regmap(np);
if (IS_ERR(regmap)) { /* Fallback to checking the parent node on "real" errors. */
ret = PTR_ERR(regmap); if (IS_ERR(regmap) && regmap != ERR_PTR(-EPROBE_DEFER)) {
dev_err(dev, "failed to get regmap: %d\n", ret); regmap = dev_get_regmap(dev->parent, NULL);
return ret; if (!regmap)
regmap = ERR_PTR(-ENODEV);
}
} }
if (IS_ERR(regmap))
return dev_err_probe(dev, PTR_ERR(regmap),
"failed to get regmap\n");
ret = of_property_count_u32_elems(np, "mux-reg-masks"); ret = of_property_count_u32_elems(np, "mux-reg-masks");
if (ret == 0 || ret % 2) if (ret == 0 || ret % 2)