Skip to content

Commit 2d18f23

Browse files
kelvincheungtsbogend
authored andcommitted
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é <[email protected]> Signed-off-by: Keguang Zhang <[email protected]> Signed-off-by: Thomas Bogendoerfer <[email protected]>
1 parent 85c4354 commit 2d18f23

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

arch/mips/include/asm/cpu.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,7 @@
248248
#define PRID_REV_VR4181A 0x0070 /* Same as VR4122 */
249249
#define PRID_REV_VR4130 0x0080
250250
#define PRID_REV_34K_V1_0_2 0x0022
251-
#define PRID_REV_LOONGSON1B 0x0020
252-
#define PRID_REV_LOONGSON1C 0x0020 /* Same as Loongson-1B */
251+
#define PRID_REV_LOONGSON1 0x0020
253252
#define PRID_REV_LOONGSON2E 0x0002
254253
#define PRID_REV_LOONGSON2F 0x0003
255254
#define PRID_REV_LOONGSON2K_R1_0 0x0000

arch/mips/kernel/cpu-probe.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1288,14 +1288,14 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
12881288
set_cpu_asid_mask(c, MIPS_ENTRYHI_ASID);
12891289
c->writecombine = _CACHE_UNCACHED_ACCELERATED;
12901290
break;
1291-
case PRID_IMP_LOONGSON_32: /* Loongson-1 */
1291+
case PRID_IMP_LOONGSON_32:
12921292
decode_configs(c);
12931293

12941294
c->cputype = CPU_LOONGSON32;
12951295

12961296
switch (c->processor_id & PRID_REV_MASK) {
1297-
case PRID_REV_LOONGSON1B:
1298-
__cpu_name[cpu] = "Loongson 1B";
1297+
case PRID_REV_LOONGSON1:
1298+
__cpu_name[cpu] = "ICT Loongson-1";
12991299
break;
13001300
}
13011301

0 commit comments

Comments
 (0)