@ -1,12 +1,26 @@
--- a/arch/mips/kernel/idle.c
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/kernel/idle.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -188,9 +188,6 @@ void __init check_wait(void)
@@ -35,6 +35,7 @@
break;
#include <asm/prom.h>
#include <asm/reboot.h>
#include <asm/time.h>
+#include <asm/idle.h>
#include <bcm47xx.h>
#include <bcm47xx_nvram.h>
#include <bcm47xx_board.h>
@@ -214,6 +215,15 @@ static void __init bcm47xx_register_bcma
panic("Failed to initialize BCMA bus (err %d)", err);
case CPU_74K:
bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL);
- cpu_wait = r4k_wait;
+
- if ((c->processor_id & 0xff) >= PRID_REV_ENCODE_332(2, 1, 0))
+ /* The BCM4706 has a problem with the CPU wait instruction.
- cpu_wait = r4k_wait_irqoff;
+ * When r4k_wait or r4k_wait_irqoff is used will just hang and
break;
+ * 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
case CPU_TX49XX: