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

Commit 190fca3e authored by Kevin Cernekee's avatar Kevin Cernekee Committed by Ralf Baechle
Browse files

MIPS: Fix regression on BCM4710 processor detection 



BCM4710 uses the BMIPS32 core (like BCM6345), not the MIPS 4Kc core as
was previously believed.

Signed-off-by: default avatarKevin Cernekee <cernekee@gmail.com>
Tested-by: default avatarAlexandros C. Couloumbis <alex@ozo.com>
Patchwork: https://patchwork.linux-mips.org/patch/1837/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 4afdea81

arch/mips/include/asm/cpu.h

+2 −2
Original line number Diff line number Diff line
@@ -111,8 +111,8 @@ 
 * These are the PRID's for when 23:16 == PRID_COMP_BROADCOM

 */



#define PRID_IMP_BMIPS4KC	0x4000

#define PRID_IMP_BMIPS32	0x8000

#define PRID_IMP_BMIPS32_REV4	0x4000

#define PRID_IMP_BMIPS32_REV8	0x8000

#define PRID_IMP_BMIPS3300	0x9000

#define PRID_IMP_BMIPS3300_ALT	0x9100

#define PRID_IMP_BMIPS3300_BUG	0x0000

arch/mips/kernel/cpu-probe.c

+2 −5
Original line number Diff line number Diff line
@@ -905,7 +905,8 @@ static inline void cpu_probe_broadcom(struct cpuinfo_mips *c, unsigned int cpu) 
{

	decode_configs(c);

	switch (c->processor_id & 0xff00) {

	case PRID_IMP_BMIPS32:

	case PRID_IMP_BMIPS32_REV4:

	case PRID_IMP_BMIPS32_REV8:

		c->cputype = CPU_BMIPS32;

		__cpu_name[cpu] = "Broadcom BMIPS32";

		break;
@@ -933,10 +934,6 @@ static inline void cpu_probe_broadcom(struct cpuinfo_mips *c, unsigned int cpu) 
		__cpu_name[cpu] = "Broadcom BMIPS5000";

		c->options |= MIPS_CPU_ULRI;

		break;

	case PRID_IMP_BMIPS4KC:

		c->cputype = CPU_4KC;

		__cpu_name[cpu] = "MIPS 4Kc";

		break;

	}

}