MIPS: Add R16000 detection

This allows the kernel to correctly detect an R16000 MIPS CPU on systems that
have those.  Otherwise, such systems will detect the CPU as an R14000, due to
similarities in the CPU PRId value.

Signed-off-by: Joshua Kinard <kumba@gentoo.org>
Cc: Linux MIPS List <linux-mips@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/9092/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/include/asm/cpu-type.h b/arch/mips/include/asm/cpu-type.h
index 8245875..33f3cab 100644 (file)
--- a/arch/mips/include/asm/cpu-type.h
+++ b/arch/mips/include/asm/cpu-type.h
@@ -157,6 +157,7 @@ static inline int __pure __get_cpu_type(const int cpu_type)
        case CPU_R10000:
        case CPU_R12000:
        case CPU_R14000:
+       case CPU_R16000:
 #endif
 #ifdef CONFIG_SYS_HAS_CPU_RM7000
        case CPU_RM7000:

diff --cc arch/mips/include/asm/cpu.h
Simple merge

diff --cc arch/mips/kernel/cpu-probe.c
Simple merge

diff --cc arch/mips/kernel/perf_event_mipsxx.c
Simple merge

diff --cc arch/mips/mm/c-r4k.c
Simple merge

diff --cc arch/mips/mm/page.c
Simple merge

diff --cc arch/mips/mm/tlb-r4k.c
Simple merge

diff --cc arch/mips/mm/tlbex.c
Simple merge

diff --cc arch/mips/oprofile/common.c
Simple merge

diff --cc arch/mips/oprofile/op_model_mipsxx.c
Simple merge