MIPS: Use PRID_REV_LOONGSON1ABC instead of the legacy macro
Subsystems (2)
PATCH 1/1 MIPS: Use PRID_REV_LOONGSON1ABC instead of the legacy macro
Signed-off-by Yang Ling <[email protected]>
--- arch/mips/include/asm/cpu.h | 3 +-- arch/mips/kernel/cpu-probe.c | 8 +++++++- arch/mips/loongson32/common/setup.c | 6 ++++-- 3 files changed, 12 insertions(+), 5 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_LOONGSON1ABC 0x0020#define PRID_REV_LOONGSON2E 0x0002#define PRID_REV_LOONGSON2F 0x0003#define PRID_REV_LOONGSON3A_R1 0x0005
arch/mips/kernel/cpu-probe.c +7 -1
@@ -1495,8 +1495,14 @@ 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_LOONGSON1ABC : +#if defined(CONFIG_CPU_LOONGSON1A ) + __cpu_name[cpu] ="Loongson 1A" ; +#elif defined(CONFIG_CPU_LOONGSON1B ) __cpu_name[cpu] ="Loongson 1B" ; +#elif defined(CONFIG_CPU_LOONGSON1C ) + __cpu_name[cpu] ="Loongson 1C" ; +#endif break ; }
arch/mips/loongson32/common/setup.c +4 -2
@@ -21,8 +21,10 @@ 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 : -#if defined(CONFIG_LOONGSON1_LS1B ) +case PRID_REV_LOONGSON1ABC : +#if defined(CONFIG_LOONGSON1_LS1A ) +return "LOONGSON LS1A" ; +#elif defined(CONFIG_LOONGSON1_LS1B )return "LOONGSON LS1B" ;#elif defined(CONFIG_LOONGSON1_LS1C )return "LOONGSON LS1C" ;
Signature · 1 line
1.9.1