1 files changed, 6 insertions, 2 deletions

diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index f82cf878d6af..48094b58c88f 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -811,6 +811,12 @@ int __init omap_mux_late_init(void)
                 }
         }
 
+        omap_mux_dbg_init();
+
+        /* see pinctrl-single-omap for the wake-up interrupt handling */
+        if (of_have_populated_dt())
+                return 0;
+
         ret = request_irq(omap_prcm_event_to_irq("io"),
                 omap_hwmod_mux_handle_irq, IRQF_SHARED | IRQF_NO_SUSPEND,
                         "hwmod_io", omap_mux_late_init);
@@ -818,8 +824,6 @@ int __init omap_mux_late_init(void)
         if (ret)
                 pr_warning("mux: Failed to setup hwmod io irq %d\n", ret);
 
-        omap_mux_dbg_init();
-
         return 0;
 }