3 files changed, 24 insertions, 1 deletions

diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 844126b39ed3..70c8ad9bc8fc 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -121,6 +121,7 @@ static inline void check_wait(void)
         case CPU_24K:
         case CPU_25KF:
         case CPU_34K:
+        case CPU_PR4450:
                 cpu_wait = r4k_wait;
                 printk(" available.\n");
                 break;
@@ -624,6 +625,21 @@ static inline void cpu_probe_sandcraft(struct cpuinfo_mips *c)
         }
 }
 
+static inline void cpu_probe_philips(struct cpuinfo_mips *c)
+{
+        decode_configs(c);
+        switch (c->processor_id & 0xff00) {
+        case PRID_IMP_PR4450:
+                c->cputype = CPU_PR4450;
+                c->isa_level = MIPS_CPU_ISA_M32;
+                break;
+        default:
+                panic("Unknown Philips Core!"); /* REVISIT: die? */
+                break;
+        }
+}
+
+
 __init void cpu_probe(void)
 {
         struct cpuinfo_mips *c = &current_cpu_data;
@@ -649,6 +665,9 @@ __init void cpu_probe(void)
         case PRID_COMP_SANDCRAFT:
                 cpu_probe_sandcraft(c);
                 break;
+        case PRID_COMP_PHILIPS:
+                cpu_probe_philips(c);
+                break;
         default:
                 c->cputype = CPU_UNKNOWN;
         }
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 1bd40af508ed..e46a92d01d51 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -80,7 +80,8 @@ static const char *cpu_name[] = {
         [CPU_VR4133]    = "NEC VR4133",
         [CPU_VR4181]    = "NEC VR4181",
         [CPU_VR4181A]   = "NEC VR4181A",
-        [CPU_SR71000]   = "Sandcraft SR71000"
+        [CPU_SR71000]   = "Sandcraft SR71000",
+        [CPU_PR4450]    = "Philips PR4450",
 };
 
 
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index fbc153c8f833..a24651dfaaba 100644
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -11,6 +11,7 @@
  * Free Software Foundation;  either version 2 of the  License, or (at your
  * option) any later version.
  */
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -112,8 +113,10 @@ static void c0_timer_ack(void)
 {
         unsigned int count;
 
+#ifndef CONFIG_SOC_PNX8550      /* pnx8550 resets to zero */
         /* Ack this timer interrupt and set the next one.  */
         expirelo += cycles_per_jiffy;
+#endif
         write_c0_compare(expirelo);
 
         /* Check to see if we have missed any timer interrupts.  */