diff options
author | Steven J. Hill <sjhill@mips.com> | 2012-12-06 22:51:35 -0500 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2013-02-16 18:15:23 -0500 |
commit | f8fa4811dbb264aef13f982e963389fd828b1ac0 (patch) | |
tree | ed1c9d2d9818671ca78feab63872d10b611ab953 /arch/mips/kernel/cpu-probe.c | |
parent | 127993e561846e889004d7d21a84fb5a6c40b9c3 (diff) |
MIPS: Add support for the M14KEc core.
Signed-off-by: Steven J. Hill <sjhill@mips.com>
Patchwork: http://patchwork.linux-mips.org/patch/4682/
Signed-off-by: John Crispin <blogic@openwrt.org>
Diffstat (limited to 'arch/mips/kernel/cpu-probe.c')
-rw-r--r-- | arch/mips/kernel/cpu-probe.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index 9f31334ed1de..ba169022fe1d 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c | |||
@@ -201,6 +201,7 @@ void __init check_wait(void) | |||
201 | break; | 201 | break; |
202 | 202 | ||
203 | case CPU_M14KC: | 203 | case CPU_M14KC: |
204 | case CPU_M14KEC: | ||
204 | case CPU_24K: | 205 | case CPU_24K: |
205 | case CPU_34K: | 206 | case CPU_34K: |
206 | case CPU_1004K: | 207 | case CPU_1004K: |
@@ -439,6 +440,8 @@ static inline unsigned int decode_config3(struct cpuinfo_mips *c) | |||
439 | c->ases |= MIPS_ASE_MIPSMT; | 440 | c->ases |= MIPS_ASE_MIPSMT; |
440 | if (config3 & MIPS_CONF3_ULRI) | 441 | if (config3 & MIPS_CONF3_ULRI) |
441 | c->options |= MIPS_CPU_ULRI; | 442 | c->options |= MIPS_CPU_ULRI; |
443 | if (config3 & MIPS_CONF3_ISA) | ||
444 | c->options |= MIPS_CPU_MICROMIPS; | ||
442 | 445 | ||
443 | return config3 & MIPS_CONF_M; | 446 | return config3 & MIPS_CONF_M; |
444 | } | 447 | } |
@@ -861,6 +864,10 @@ static inline void cpu_probe_mips(struct cpuinfo_mips *c, unsigned int cpu) | |||
861 | c->cputype = CPU_M14KC; | 864 | c->cputype = CPU_M14KC; |
862 | __cpu_name[cpu] = "MIPS M14Kc"; | 865 | __cpu_name[cpu] = "MIPS M14Kc"; |
863 | break; | 866 | break; |
867 | case PRID_IMP_M14KEC: | ||
868 | c->cputype = CPU_M14KEC; | ||
869 | __cpu_name[cpu] = "MIPS M14KEc"; | ||
870 | break; | ||
864 | case PRID_IMP_1004K: | 871 | case PRID_IMP_1004K: |
865 | c->cputype = CPU_1004K; | 872 | c->cputype = CPU_1004K; |
866 | __cpu_name[cpu] = "MIPS 1004Kc"; | 873 | __cpu_name[cpu] = "MIPS 1004Kc"; |