aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel
diff options
context:
space:
mode:
authorPete Popov <ppopov@embeddedalley.com>2005-03-01 01:33:16 -0500
committerRalf Baechle <ralf@linux-mips.org>2005-10-29 14:30:47 -0400
commite3ad1c23ba72214669b364c6fa304531dc768c3e (patch)
treebc1e0004d3df66b4c37a2deb8d89431657039719 /arch/mips/kernel
parent784f7b9d895893c6aa3ca471c1344a62fc29c285 (diff)
Base Au1200 2.6 support.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r--arch/mips/kernel/cpu-probe.c5
-rw-r--r--arch/mips/kernel/proc.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 7685f8baf3f0..66c2a2788ffe 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -116,6 +116,8 @@ static inline void check_wait(void)
116 case CPU_AU1000: 116 case CPU_AU1000:
117 case CPU_AU1100: 117 case CPU_AU1100:
118 case CPU_AU1500: 118 case CPU_AU1500:
119 case CPU_AU1550:
120 case CPU_AU1200:
119 if (au1k_wait_ptr != NULL) { 121 if (au1k_wait_ptr != NULL) {
120 cpu_wait = au1k_wait_ptr; 122 cpu_wait = au1k_wait_ptr;
121 printk(" available.\n"); 123 printk(" available.\n");
@@ -505,6 +507,9 @@ static inline void cpu_probe_alchemy(struct cpuinfo_mips *c)
505 case 3: 507 case 3:
506 c->cputype = CPU_AU1550; 508 c->cputype = CPU_AU1550;
507 break; 509 break;
510 case 4:
511 c->cputype = CPU_AU1200;
512 break;
508 default: 513 default:
509 panic("Unknown Au Core!"); 514 panic("Unknown Au Core!");
510 break; 515 break;
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 760fcdfea18e..13888520d41c 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -60,6 +60,9 @@ static const char *cpu_name[] = {
60 [CPU_TX3927] "TX3927", 60 [CPU_TX3927] "TX3927",
61 [CPU_AU1000] "Au1000", 61 [CPU_AU1000] "Au1000",
62 [CPU_AU1500] "Au1500", 62 [CPU_AU1500] "Au1500",
63 [CPU_AU1100] "Au1100",
64 [CPU_AU1550] "Au1550",
65 [CPU_AU1200] "Au1200",
63 [CPU_4KEC] "MIPS 4KEc", 66 [CPU_4KEC] "MIPS 4KEc",
64 [CPU_4KSC] "MIPS 4KSc", 67 [CPU_4KSC] "MIPS 4KSc",
65 [CPU_VR41XX] "NEC Vr41xx", 68 [CPU_VR41XX] "NEC Vr41xx",