ARM: OMAP2+: Check also the first dts child for hwmod flags

Until the board specific dts files are updated to have hwmod
flags at the interconnect target module level, we want to keep
things working both for old and new dts files.

So let's also check the first child for hwmod flags. The module
flags are for the whole module, so only the first child should
ever have them.

Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Reported-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 083dcd9..b506d5d 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -2345,6 +2345,17 @@ static int __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data,
        return 0;
 }
 
+static void __init parse_module_flags(struct omap_hwmod *oh,
+                                     struct device_node *np)
+{
+       if (of_find_property(np, "ti,no-reset-on-init", NULL))
+               oh->flags |= HWMOD_INIT_NO_RESET;
+       if (of_find_property(np, "ti,no-idle-on-init", NULL))
+               oh->flags |= HWMOD_INIT_NO_IDLE;
+       if (of_find_property(np, "ti,no-idle", NULL))
+               oh->flags |= HWMOD_NO_IDLE;
+}
+
 /**
  * _init - initialize internal data for the hwmod @oh
  * @oh: struct omap_hwmod *
@@ -2392,12 +2403,12 @@ static int __init _init(struct omap_hwmod *oh, void *data)
        }
 
        if (np) {
-               if (of_find_property(np, "ti,no-reset-on-init", NULL))
-                       oh->flags |= HWMOD_INIT_NO_RESET;
-               if (of_find_property(np, "ti,no-idle-on-init", NULL))
-                       oh->flags |= HWMOD_INIT_NO_IDLE;
-               if (of_find_property(np, "ti,no-idle", NULL))
-                       oh->flags |= HWMOD_NO_IDLE;
+               struct device_node *child;
+
+               parse_module_flags(oh, np);
+               child = of_get_next_child(np, NULL);
+               if (child)
+                       parse_module_flags(oh, child);
        }
 
        oh->_state = _HWMOD_STATE_INITIALIZED;