1 files changed, 25 insertions, 9 deletions

diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
index 2d6e7cccae6b..12d77e9c2cb4 100644
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -202,15 +202,6 @@ static void __init bcm47xx_register_bcma(void)
                 panic("Failed to initialize BCMA bus (err %d)", err);
 
         bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL);
-
-        /* The BCM4706 has a problem with the CPU wait instruction.
-         * When r4k_wait or r4k_wait_irqoff is used will just hang and
-         * not return from a msleep(). Removing the cpu_wait
-         * functionality is a workaround for this problem. The BCM4716
-         * does not have this problem.
-         */
-        if (bcm47xx_bus.bcma.bus.chipinfo.id == BCMA_CHIP_ID_BCM4706)
-                cpu_wait = NULL;
 }
 #endif
 
@@ -241,6 +232,31 @@ void __init plat_mem_setup(void)
         mips_set_machine_name(bcm47xx_board_get_name());
 }
 
+static int __init bcm47xx_cpu_fixes(void)
+{
+        switch (bcm47xx_bus_type) {
+#ifdef CONFIG_BCM47XX_SSB
+        case BCM47XX_BUS_TYPE_SSB:
+                /* Nothing to do */
+                break;
+#endif
+#ifdef CONFIG_BCM47XX_BCMA
+        case BCM47XX_BUS_TYPE_BCMA:
+                /* The BCM4706 has a problem with the CPU wait instruction.
+                 * When r4k_wait or r4k_wait_irqoff is used will just hang and
+                 * not return from a msleep(). Removing the cpu_wait
+                 * functionality is a workaround for this problem. The BCM4716
+                 * does not have this problem.
+                 */
+                if (bcm47xx_bus.bcma.bus.chipinfo.id == BCMA_CHIP_ID_BCM4706)
+                        cpu_wait = NULL;
+                break;
+#endif
+        }
+        return 0;
+}
+arch_initcall(bcm47xx_cpu_fixes);
+
 static int __init bcm47xx_register_bus_complete(void)
 {
         switch (bcm47xx_bus_type) {