1 files changed, 4 insertions, 17 deletions

diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 1bdbcad3bb74..b13b8eb30596 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -183,13 +183,7 @@ void __init check_wait(void)
         case CPU_TX49XX:
                 cpu_wait = r4k_wait_irqoff;
                 break;
-        case CPU_AU1000:
-        case CPU_AU1100:
-        case CPU_AU1500:
-        case CPU_AU1550:
-        case CPU_AU1200:
-        case CPU_AU1210:
-        case CPU_AU1250:
+        case CPU_ALCHEMY:
                 cpu_wait = au1k_wait;
                 break;
         case CPU_20KC:
@@ -783,37 +777,30 @@ static inline void cpu_probe_alchemy(struct cpuinfo_mips *c, unsigned int cpu)
         switch (c->processor_id & 0xff00) {
         case PRID_IMP_AU1_REV1:
         case PRID_IMP_AU1_REV2:
+                c->cputype = CPU_ALCHEMY;
                 switch ((c->processor_id >> 24) & 0xff) {
                 case 0:
-                        c->cputype = CPU_AU1000;
                         __cpu_name[cpu] = "Au1000";
                         break;
                 case 1:
-                        c->cputype = CPU_AU1500;
                         __cpu_name[cpu] = "Au1500";
                         break;
                 case 2:
-                        c->cputype = CPU_AU1100;
                         __cpu_name[cpu] = "Au1100";
                         break;
                 case 3:
-                        c->cputype = CPU_AU1550;
                         __cpu_name[cpu] = "Au1550";
                         break;
                 case 4:
-                        c->cputype = CPU_AU1200;
                         __cpu_name[cpu] = "Au1200";
-                        if ((c->processor_id & 0xff) == 2) {
-                                c->cputype = CPU_AU1250;
+                        if ((c->processor_id & 0xff) == 2)
                                 __cpu_name[cpu] = "Au1250";
-                        }
                         break;
                 case 5:
-                        c->cputype = CPU_AU1210;
                         __cpu_name[cpu] = "Au1210";
                         break;
                 default:
-                        panic("Unknown Au Core!");
+                        __cpu_name[cpu] = "Au1xxx";
                         break;
                 }
                 break;