diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2005-07-12 12:12:05 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 14:31:45 -0400 |
commit | bbc7f22f6dca8a075b565ade49e9a982f89707c3 (patch) | |
tree | 06f2055cd1bb17f1330023bf111dc9fa7b1d589c /arch/mips/kernel | |
parent | 079ef8bb809c701fa0ab09d8984262693b854f94 (diff) |
Detect the 34K.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r-- | arch/mips/kernel/cpu-probe.c | 5 | ||||
-rw-r--r-- | arch/mips/kernel/proc.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index 2b6db681417d..e40bd6fccea5 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c | |||
@@ -104,6 +104,7 @@ static inline void check_wait(void) | |||
104 | /* case CPU_20KC:*/ | 104 | /* case CPU_20KC:*/ |
105 | case CPU_24K: | 105 | case CPU_24K: |
106 | case CPU_25KF: | 106 | case CPU_25KF: |
107 | case CPU_34K: | ||
107 | cpu_wait = r4k_wait; | 108 | cpu_wait = r4k_wait; |
108 | printk(" available.\n"); | 109 | printk(" available.\n"); |
109 | break; | 110 | break; |
@@ -538,6 +539,10 @@ static inline void cpu_probe_mips(struct cpuinfo_mips *c) | |||
538 | /* Probe for L2 cache */ | 539 | /* Probe for L2 cache */ |
539 | c->scache.flags &= ~MIPS_CACHE_NOT_PRESENT; | 540 | c->scache.flags &= ~MIPS_CACHE_NOT_PRESENT; |
540 | break; | 541 | break; |
542 | case PRID_IMP_34K: | ||
543 | c->cputype = CPU_34K; | ||
544 | c->isa_level = MIPS_CPU_ISA_M32; | ||
545 | break; | ||
541 | } | 546 | } |
542 | } | 547 | } |
543 | 548 | ||
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c index cf31d3952d65..1bd40af508ed 100644 --- a/arch/mips/kernel/proc.c +++ b/arch/mips/kernel/proc.c | |||
@@ -72,6 +72,7 @@ static const char *cpu_name[] = { | |||
72 | [CPU_20KC] = "MIPS 20Kc", | 72 | [CPU_20KC] = "MIPS 20Kc", |
73 | [CPU_24K] = "MIPS 24K", | 73 | [CPU_24K] = "MIPS 24K", |
74 | [CPU_25KF] = "MIPS 25Kf", | 74 | [CPU_25KF] = "MIPS 25Kf", |
75 | [CPU_34K] = "MIPS 34K", | ||
75 | [CPU_VR4111] = "NEC VR4111", | 76 | [CPU_VR4111] = "NEC VR4111", |
76 | [CPU_VR4121] = "NEC VR4121", | 77 | [CPU_VR4121] = "NEC VR4121", |
77 | [CPU_VR4122] = "NEC VR4122", | 78 | [CPU_VR4122] = "NEC VR4122", |