ARM: OMAP2+: WDTIMER integration: fix !PM boot crash, disarm timer after hwmod reset

[deliverable/linux.git] / arch / arm / mach-omap2 / io.c

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 065bd768987cfbc9dabd513f4dc41cef54d7dc9d..fafcc35b970c4611d32ed7ff70b80e3958748d36 100644 (file)
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -363,24 +363,6 @@ static void __init omap_hwmod_init_postsetup(void)
 #endif
        omap_hwmod_for_each(_set_hwmod_postsetup_state, &postsetup_state);
 
-       /*
-        * Set the default postsetup state for unusual modules (like
-        * MPU WDT).
-        *
-        * The postsetup_state is not actually used until
-        * omap_hwmod_late_init(), so boards that desire full watchdog
-        * coverage of kernel initialization can reprogram the
-        * postsetup_state between the calls to
-        * omap2_init_common_infra() and omap_sdrc_init().
-        *
-        * XXX ideally we could detect whether the MPU WDT was currently
-        * enabled here and make this conditional
-        */
-       postsetup_state = _HWMOD_STATE_DISABLED;
-       omap_hwmod_for_each_by_class("wd_timer",
-                                    _set_hwmod_postsetup_state,
-                                    &postsetup_state);
-
        omap_pm_if_early_init();
 }