1 files changed, 17 insertions, 4 deletions

diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 89c3304cb93c..335a6ae3d594 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -169,6 +169,7 @@ static inline void check_wait(void)
 
         case CPU_24K:
         case CPU_34K:
+        case CPU_1004K:
                 cpu_wait = r4k_wait;
                 if (read_c0_config7() & MIPS_CONF7_WII)
                         cpu_wait = r4k_wait_irqoff;
@@ -675,6 +676,12 @@ static void __cpuinit decode_configs(struct cpuinfo_mips *c)
                 return;
 }
 
+#ifdef CONFIG_CPU_MIPSR2
+extern void spram_config(void);
+#else
+static inline void spram_config(void) {}
+#endif
+
 static inline void cpu_probe_mips(struct cpuinfo_mips *c)
 {
         decode_configs(c);
@@ -711,7 +718,12 @@ static inline void cpu_probe_mips(struct cpuinfo_mips *c)
         case PRID_IMP_74K:
                 c->cputype = CPU_74K;
                 break;
+        case PRID_IMP_1004K:
+                c->cputype = CPU_1004K;
+                break;
         }
+
+        spram_config();
 }
 
 static inline void cpu_probe_alchemy(struct cpuinfo_mips *c)
@@ -778,7 +790,7 @@ static inline void cpu_probe_sandcraft(struct cpuinfo_mips *c)
         }
 }
 
-static inline void cpu_probe_philips(struct cpuinfo_mips *c)
+static inline void cpu_probe_nxp(struct cpuinfo_mips *c)
 {
         decode_configs(c);
         switch (c->processor_id & 0xff00) {
@@ -787,7 +799,7 @@ static inline void cpu_probe_philips(struct cpuinfo_mips *c)
                 c->isa_level = MIPS_CPU_ISA_M32R1;
                 break;
         default:
-                panic("Unknown Philips Core!"); /* REVISIT: die? */
+                panic("Unknown NXP Core!"); /* REVISIT: die? */
                 break;
         }
 }
@@ -876,6 +888,7 @@ static __cpuinit const char *cpu_to_name(struct cpuinfo_mips *c)
         case CPU_24K:           name = "MIPS 24K"; break;
         case CPU_25KF:          name = "MIPS 25Kf"; break;
         case CPU_34K:           name = "MIPS 34K"; break;
+        case CPU_1004K:         name = "MIPS 1004K"; break;
         case CPU_74K:           name = "MIPS 74K"; break;
         case CPU_VR4111:        name = "NEC VR4111"; break;
         case CPU_VR4121:        name = "NEC VR4121"; break;
@@ -925,8 +938,8 @@ __cpuinit void cpu_probe(void)
         case PRID_COMP_SANDCRAFT:
                 cpu_probe_sandcraft(c);
                 break;
-        case PRID_COMP_PHILIPS:
-                cpu_probe_philips(c);
+        case PRID_COMP_NXP:
+                cpu_probe_nxp(c);
                 break;
         default:
                 c->cputype = CPU_UNKNOWN;