Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26859198 authored by Huacai Chen's avatar Huacai Chen Committed by Ralf Baechle
Browse files

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: default avatarHuacai Chen <chenhc@lemote.com>
Tested-by: default avatarAlex Smith <alex.smith@imgtec.com>
Reviewed-by: default avatarAlex 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: default avatarRalf Baechle <ralf@linux-mips.org>
parent 9b3384be

arch/mips/include/asm/cpu.h

+2 −2
Original line number Diff line number Diff line
@@ -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

arch/mips/kernel/cpu-probe.c

+2 −2
Original line number Diff line number Diff line
@@ -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;