Commit 9f91e506 authored by Yoichi Yuasa's avatar Yoichi Yuasa Committed by Ralf Baechle

MIPS: VR4133: Fix probe for LL/SC.

Signed-off-by: default avatarYoichi Yuasa <yuasa@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/4963/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 0c81157b
...@@ -580,6 +580,9 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu) ...@@ -580,6 +580,9 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
c->tlbsize = 48; c->tlbsize = 48;
break; break;
case PRID_IMP_VR41XX: case PRID_IMP_VR41XX:
set_isa(c, MIPS_CPU_ISA_III);
c->options = R4K_OPTS;
c->tlbsize = 32;
switch (c->processor_id & 0xf0) { switch (c->processor_id & 0xf0) {
case PRID_REV_VR4111: case PRID_REV_VR4111:
c->cputype = CPU_VR4111; c->cputype = CPU_VR4111;
...@@ -604,6 +607,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu) ...@@ -604,6 +607,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
__cpu_name[cpu] = "NEC VR4131"; __cpu_name[cpu] = "NEC VR4131";
} else { } else {
c->cputype = CPU_VR4133; c->cputype = CPU_VR4133;
c->options |= MIPS_CPU_LLSC;
__cpu_name[cpu] = "NEC VR4133"; __cpu_name[cpu] = "NEC VR4133";
} }
break; break;
...@@ -613,9 +617,6 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu) ...@@ -613,9 +617,6 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
__cpu_name[cpu] = "NEC Vr41xx"; __cpu_name[cpu] = "NEC Vr41xx";
break; break;
} }
set_isa(c, MIPS_CPU_ISA_III);
c->options = R4K_OPTS;
c->tlbsize = 32;
break; break;
case PRID_IMP_R4300: case PRID_IMP_R4300:
c->cputype = CPU_R4300; c->cputype = CPU_R4300;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment