| From 3c622b1d125c042dbca26e21ab235581ce571db7 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 8 Mar 2021 11:35:06 +0200 |
| Subject: bus: ti-sysc: Fix initializing module_pa for modules without sysc |
| register |
| |
| From: Tony Lindgren <tony@atomide.com> |
| |
| [ Upstream commit 7bad5af826aba00487fed9a3300d3f43f0cba11b ] |
| |
| We have interconnect target modules with no known registers using only |
| clocks and resets, but we still want to detect them based on the module |
| IO range. So let's call sysc_parse_and_check_child_range() earlier so we |
| have module_pa properly initialized. |
| |
| Fixes: 2928135c93f8 ("bus: ti-sysc: Support modules without control registers") |
| Signed-off-by: Tony Lindgren <tony@atomide.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/bus/ti-sysc.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c |
| index 9e535336689f..68145e326eb9 100644 |
| --- a/drivers/bus/ti-sysc.c |
| +++ b/drivers/bus/ti-sysc.c |
| @@ -901,9 +901,6 @@ static int sysc_map_and_check_registers(struct sysc *ddata) |
| struct device_node *np = ddata->dev->of_node; |
| int error; |
| |
| - if (!of_get_property(np, "reg", NULL)) |
| - return 0; |
| - |
| error = sysc_parse_and_check_child_range(ddata); |
| if (error) |
| return error; |
| @@ -914,6 +911,9 @@ static int sysc_map_and_check_registers(struct sysc *ddata) |
| |
| sysc_check_children(ddata); |
| |
| + if (!of_get_property(np, "reg", NULL)) |
| + return 0; |
| + |
| error = sysc_parse_registers(ddata); |
| if (error) |
| return error; |
| -- |
| 2.30.2 |
| |
