MIPS: Loongson: Merge PRID_REV_LOONGSON1*
Subsystems (2)
PATCH 1/1 MIPS: Loongson: Merge PRID_REV_LOONGSON1*
Loongson 1 is a 32-bit MIPS CPU family with PRID 0x4220.
Signed-off-by 谢致邦 (XIE Zhibang) <[email protected]>
--- arch/mips/include/asm/cpu.h | 3 +-- arch/mips/kernel/cpu-probe.c | 2 +- arch/mips/loongson32/common/setup.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)
arch/mips/include/asm/cpu.h +1 -2
@@ -239,8 +239,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_LOONGSON3A_R1 0x0005
arch/mips/kernel/cpu-probe.c +1 -1
@@ -1502,7 +1502,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu) c->cputype =CPU_LOONGSON1 ;switch (c->processor_id &PRID_REV_MASK ) { -case PRID_REV_LOONGSON1B : +case PRID_REV_LOONGSON1 : __cpu_name[cpu] ="Loongson 1B" ;break ; }
arch/mips/loongson32/common/setup.c +1 -1
@@ -21,7 +21,7 @@ const char *get_system_type(void)unsigned int processor_id = (¤t_cpu_data)->processor_id;switch (processor_id &PRID_REV_MASK ) { -case PRID_REV_LOONGSON1B : +case PRID_REV_LOONGSON1 :#if defined(CONFIG_LOONGSON1_LS1B )return "LOONGSON LS1B" ;#elif defined(CONFIG_LOONGSON1_LS1C )
Signature · 1 line
2.11.0