1 files changed, 30 insertions, 10 deletions

diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 1abe9905c9c1..f709657e4dcd 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -31,7 +31,7 @@
  * The wait instruction stops the pipeline and reduces the power consumption of
  * the CPU very much.
  */
-void (*cpu_wait)(void) = NULL;
+void (*cpu_wait)(void);
 
 static void r3081_wait(void)
 {
@@ -91,16 +91,13 @@ static void rm7k_wait_irqoff(void)
         local_irq_enable();
 }
 
-/* The Au1xxx wait is available only if using 32khz counter or
- * external timer source, but specifically not CP0 Counter. */
-int allow_au1k_wait;
-
+/*
+ * The Au1xxx wait is available only if using 32khz counter or
+ * external timer source, but specifically not CP0 Counter.
+ * alchemy/common/time.c may override cpu_wait!
+ */
 static void au1k_wait(void)
 {
-        if (!allow_au1k_wait)
-                return;
-
-        /* using the wait instruction makes CP0 counter unusable */
         __asm__("       .set    mips3                   \n"
                 "       cache   0x14, 0(%0)             \n"
                 "       cache   0x14, 32(%0)            \n"
@@ -115,7 +112,7 @@ static void au1k_wait(void)
                 : : "r" (au1k_wait));
 }
 
-static int __initdata nowait = 0;
+static int __initdata nowait;
 
 static int __init wait_disable(char *s)
 {
@@ -159,6 +156,9 @@ void __init check_wait(void)
         case CPU_25KF:
         case CPU_PR4450:
         case CPU_BCM3302:
+        case CPU_BCM6338:
+        case CPU_BCM6348:
+        case CPU_BCM6358:
         case CPU_CAVIUM_OCTEON:
                 cpu_wait = r4k_wait;
                 break;
@@ -857,6 +857,7 @@ static inline void cpu_probe_broadcom(struct cpuinfo_mips *c, unsigned int cpu)
         decode_configs(c);
         switch (c->processor_id & 0xff00) {
         case PRID_IMP_BCM3302:
+         /* same as PRID_IMP_BCM6338 */
                 c->cputype = CPU_BCM3302;
                 __cpu_name[cpu] = "Broadcom BCM3302";
                 break;
@@ -864,6 +865,25 @@ static inline void cpu_probe_broadcom(struct cpuinfo_mips *c, unsigned int cpu)
                 c->cputype = CPU_BCM4710;
                 __cpu_name[cpu] = "Broadcom BCM4710";
                 break;
+        case PRID_IMP_BCM6345:
+                c->cputype = CPU_BCM6345;
+                __cpu_name[cpu] = "Broadcom BCM6345";
+                break;
+        case PRID_IMP_BCM6348:
+                c->cputype = CPU_BCM6348;
+                __cpu_name[cpu] = "Broadcom BCM6348";
+                break;
+        case PRID_IMP_BCM4350:
+                switch (c->processor_id & 0xf0) {
+                case PRID_REV_BCM6358:
+                        c->cputype = CPU_BCM6358;
+                        __cpu_name[cpu] = "Broadcom BCM6358";
+                        break;
+                default:
+                        c->cputype = CPU_UNKNOWN;
+                        break;
+                }
+                break;
         }
 }