1 files changed, 22 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index ee5f38df477d..cbb908dc5cf0 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -2635,11 +2635,33 @@ static int __init _setup(struct omap_hwmod *oh, void *data)
         if (oh->_state != _HWMOD_STATE_INITIALIZED)
                 return 0;
 
+        if (oh->parent_hwmod) {
+                int r;
+
+                r = _enable(oh->parent_hwmod);
+                WARN(r, "hwmod: %s: setup: failed to enable parent hwmod %s\n",
+                     oh->name, oh->parent_hwmod->name);
+        }
+
         _setup_iclk_autoidle(oh);
 
         if (!_setup_reset(oh))
                 _setup_postsetup(oh);
 
+        if (oh->parent_hwmod) {
+                u8 postsetup_state;
+
+                postsetup_state = oh->parent_hwmod->_postsetup_state;
+
+                if (postsetup_state == _HWMOD_STATE_IDLE)
+                        _idle(oh->parent_hwmod);
+                else if (postsetup_state == _HWMOD_STATE_DISABLED)
+                        _shutdown(oh->parent_hwmod);
+                else if (postsetup_state != _HWMOD_STATE_ENABLED)
+                        WARN(1, "hwmod: %s: unknown postsetup state %d! defaulting to enabled\n",
+                             oh->parent_hwmod->name, postsetup_state);
+        }
+
         return 0;
 }