aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel
diff options
context:
space:
mode:
authorSteven J. Hill <sjhill@mips.com>2012-12-06 22:51:35 -0500
committerJohn Crispin <blogic@openwrt.org>2013-02-16 18:15:23 -0500
commitf8fa4811dbb264aef13f982e963389fd828b1ac0 (patch)
treeed1c9d2d9818671ca78feab63872d10b611ab953 /arch/mips/kernel
parent127993e561846e889004d7d21a84fb5a6c40b9c3 (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')
-rw-r--r--arch/mips/kernel/cpu-probe.c7
-rw-r--r--arch/mips/kernel/proc.c1
2 files changed, 8 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";
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 07dff54f2ce8..239ae03f3330 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -73,6 +73,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
73 if (cpu_has_dsp) seq_printf(m, "%s", " dsp"); 73 if (cpu_has_dsp) seq_printf(m, "%s", " dsp");
74 if (cpu_has_dsp2) seq_printf(m, "%s", " dsp2"); 74 if (cpu_has_dsp2) seq_printf(m, "%s", " dsp2");
75 if (cpu_has_mipsmt) seq_printf(m, "%s", " mt"); 75 if (cpu_has_mipsmt) seq_printf(m, "%s", " mt");
76 if (cpu_has_mmips) seq_printf(m, "%s", " micromips");
76 seq_printf(m, "\n"); 77 seq_printf(m, "\n");
77 78
78 seq_printf(m, "shadow register sets\t: %d\n", 79 seq_printf(m, "shadow register sets\t: %d\n",