MIPS: Loongson: Rename PRID_IMP_LOONGSON1 and PRID_IMP_LOONGSON2

Loongson-1 is a 32-bit MIPS CPU and Loongson-2/3 are 64-bit MIPS CPUs,
and both Loongson-2/3 has the same PRID IMP filed (0x6300). As a
result, renaming PRID_IMP_LOONGSON1 and PRID_IMP_LOONGSON2 to
PRID_IMP_LOONGSON_32 and PRID_IMP_LOONGSON_64 will make more sense.

Signed-off-by: Huacai Chen <chenhc@lemote.com>
Tested-by: Alex Smith <alex.smith@imgtec.com>
Reviewed-by: Alex Smith <alex.smith@imgtec.com>
Cc: John Crispin <john@phrozen.org>
Cc: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: linux-mips@linux-mips.org
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/6552/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index 64b4b69d26f46542998c8309f582d81f53035dc5..01d757c83201cf9f9a31be9bb70d7a184289d745 100644 (file)
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -82,10 +82,10 @@
 #define PRID_IMP_RM7000                0x2700
 #define PRID_IMP_NEVADA                0x2800          /* RM5260 ??? */
 #define PRID_IMP_RM9000                0x3400
-#define PRID_IMP_LOONGSON1     0x4200
+#define PRID_IMP_LOONGSON_32   0x4200  /* Loongson-1 */
 #define PRID_IMP_R5432         0x5400
 #define PRID_IMP_R5500         0x5500
-#define PRID_IMP_LOONGSON2     0x6300
+#define PRID_IMP_LOONGSON_64   0x6300  /* Loongson-2/3 */
 
 #define PRID_IMP_UNKNOWN       0xff00
 

diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index f4229544df105458b3a5f54cc04eec3ed10c15ec..34df5afa2d6f145e7de993ab89ea7cb3e1480dc5 100644 (file)
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -734,7 +734,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                             MIPS_CPU_LLSC;
                c->tlbsize = 64;
                break;
-       case PRID_IMP_LOONGSON2:
+       case PRID_IMP_LOONGSON_64:  /* Loongson-2/3 */
                c->cputype = CPU_LOONGSON2;
                __cpu_name[cpu] = "ICT Loongson-2";
 
@@ -753,7 +753,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                             MIPS_CPU_32FPR;
                c->tlbsize = 64;
                break;
-       case PRID_IMP_LOONGSON1:
+       case PRID_IMP_LOONGSON_32:  /* Loongson-1 */
                decode_configs(c);
 
                c->cputype = CPU_LOONGSON1;