MIPS: Unify Loongson1 PRID_REV

LS1B and LS1C share the same PRID value, so unify them
into a single definition: PRID_REV_LOONGSON1.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Keguang Zhang <keguang.zhang@gmail.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index 32cf5496006e4df553c21fd46f7ad4b2e2f17c5e..0fd9f9bbd21f1d69077c3605908d51bf8a017eca 100644 (file)
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -248,8 +248,7 @@
 #define PRID_REV_VR4181A               0x0070  /* Same as VR4122 */
 #define PRID_REV_VR4130                        0x0080
 #define PRID_REV_34K_V1_0_2            0x0022
-#define PRID_REV_LOONGSON1B            0x0020
-#define PRID_REV_LOONGSON1C            0x0020  /* Same as Loongson-1B */
+#define PRID_REV_LOONGSON1             0x0020
 #define PRID_REV_LOONGSON2E            0x0002
 #define PRID_REV_LOONGSON2F            0x0003
 #define PRID_REV_LOONGSON2K_R1_0       0x0000

diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 04dc9ab555244db7df0a4e0853ec7444b38a1397..1e49e05ac8b1c4140ab09ef173a8dd4077642980 100644 (file)
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -1288,14 +1288,14 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                set_cpu_asid_mask(c, MIPS_ENTRYHI_ASID);
                c->writecombine = _CACHE_UNCACHED_ACCELERATED;
                break;
-       case PRID_IMP_LOONGSON_32:  /* Loongson-1 */
+       case PRID_IMP_LOONGSON_32:
                decode_configs(c);
 
                c->cputype = CPU_LOONGSON32;
 
                switch (c->processor_id & PRID_REV_MASK) {
-               case PRID_REV_LOONGSON1B:
-                       __cpu_name[cpu] = "Loongson 1B";
+               case PRID_REV_LOONGSON1:
+                       __cpu_name[cpu] = "ICT Loongson-1";
                        break;
                }