brcm47xx: fix cpu wait for BCM4706

[openwrt.git] / target / linux / brcm47xx / patches-3.10 / 170-fix-74k-cpu.patch

diff --git a/target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch b/target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch
index e25451bcdbd30505c7f4c9ec9d8979a7b04c33bb..e22bfc96a29072b572eedb2bd916909ffa37905a 100644 (file)
--- a/target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch
+++ b/target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch
@@ -8,19 +8,18 @@
  #include <bcm47xx.h>
  #include <bcm47xx_nvram.h>
  #include <bcm47xx_board.h>
-@@ -199,6 +200,15 @@ static void __init bcm47xx_register_bcma
-               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;
- }
+@@ -239,6 +240,14 @@ static int __init bcm47xx_register_bus_c
+ #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;
+               bcma_bus_register(&bcm47xx_bus.bcma.bus);
+               break;
  #endif
-