aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel
diff options
context:
space:
mode:
authorChris Dearman <chris@mips.com>2006-05-02 09:08:46 -0400
committerRalf Baechle <ralf@linux-mips.org>2006-05-31 19:28:30 -0400
commitc620953c32d301c2a7bc73f9f780301e110b7d7c (patch)
tree68be959e79ba34ca4704f1e2ad421eb404b34aa2 /arch/mips/kernel
parent98a41de99a4e4febe99b22c3a28d434caeb3165c (diff)
[MIPS] Fix detection and handling of the 74K processor.
Nothing exciting; Linux just didn't know it yet so this is most adding a value to a case statement. Signed-off-by: Chris Dearman <chris@mips.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r--arch/mips/kernel/cpu-probe.c4
-rw-r--r--arch/mips/kernel/proc.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 58b3b14873cb..17184921b71d 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)
121 case CPU_24K: 121 case CPU_24K:
122 case CPU_25KF: 122 case CPU_25KF:
123 case CPU_34K: 123 case CPU_34K:
124 case CPU_74K:
124 case CPU_PR4450: 125 case CPU_PR4450:
125 cpu_wait = r4k_wait; 126 cpu_wait = r4k_wait;
126 printk(" available.\n"); 127 printk(" available.\n");
@@ -593,6 +594,9 @@ static inline void cpu_probe_mips(struct cpuinfo_mips *c)
593 case PRID_IMP_34K: 594 case PRID_IMP_34K:
594 c->cputype = CPU_34K; 595 c->cputype = CPU_34K;
595 break; 596 break;
597 case PRID_IMP_74K:
598 c->cputype = CPU_74K;
599 break;
596 } 600 }
597} 601}
598 602
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 84ab959f924a..197952c44467 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -74,6 +74,7 @@ static const char *cpu_name[] = {
74 [CPU_24K] = "MIPS 24K", 74 [CPU_24K] = "MIPS 24K",
75 [CPU_25KF] = "MIPS 25Kf", 75 [CPU_25KF] = "MIPS 25Kf",
76 [CPU_34K] = "MIPS 34K", 76 [CPU_34K] = "MIPS 34K",
77 [CPU_74K] = "MIPS 74K",
77 [CPU_VR4111] = "NEC VR4111", 78 [CPU_VR4111] = "NEC VR4111",
78 [CPU_VR4121] = "NEC VR4121", 79 [CPU_VR4121] = "NEC VR4121",
79 [CPU_VR4122] = "NEC VR4122", 80 [CPU_VR4122] = "NEC VR4122",