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

Commit 252617a4 authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

MIPS: ingenic: Add newer vendor IDs 



Ingenic have actually varied the vendor/company ID of the XBurst cores
across their range of SoCs, whilst keeping the product ID & revision
constant... Add definitions for vendor IDs known to be used in some of
Ingenic's newer SoCs, and handle them in the same way as the existing
Ingenic vendor ID from the JZ4740.

Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Co-authored-by: default avatarPaul Cercueil <paul@crapouillou.net>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: linux-mips@linux-mips.org
Cc: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: Joshua Kinard <kumba@gentoo.org>
Cc: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
Cc: Maciej W. Rozycki <macro@linux-mips.org>
Cc: linux-kernel@vger.kernel.org
Cc: Huacai Chen <chenhc@lemote.com>
Cc: Markos Chandras <markos.chandras@imgtec.com>
Patchwork: https://patchwork.linux-mips.org/patch/10128/


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

arch/mips/include/asm/cpu.h

+4 −2
Original line number Diff line number Diff line
@@ -42,7 +42,9 @@ 
#define PRID_COMP_LEXRA		0x0b0000

#define PRID_COMP_NETLOGIC	0x0c0000

#define PRID_COMP_CAVIUM	0x0d0000

#define PRID_COMP_INGENIC	0xd00000

#define PRID_COMP_INGENIC_D0	0xd00000	/* JZ4740, JZ4750 */

#define PRID_COMP_INGENIC_D1	0xd10000	/* JZ4770, JZ4775 */

#define PRID_COMP_INGENIC_E1	0xe10000	/* JZ4780 */



/*

 * Assigned Processor ID (implementation) values for bits 15:8 of the PRId
@@ -168,7 +170,7 @@ 
#define PRID_IMP_CAVIUM_CN70XX 0x9600



/*

 * These are the PRID's for when 23:16 == PRID_COMP_INGENIC

 * These are the PRID's for when 23:16 == PRID_COMP_INGENIC_*

 */



#define PRID_IMP_JZRISC	       0x0200

arch/mips/kernel/cpu-probe.c

+3 −1
Original line number Diff line number Diff line
@@ -1443,7 +1443,9 @@ void cpu_probe(void) 
	case PRID_COMP_CAVIUM:

		cpu_probe_cavium(c, cpu);

		break;

	case PRID_COMP_INGENIC:

	case PRID_COMP_INGENIC_D0:

	case PRID_COMP_INGENIC_D1:

	case PRID_COMP_INGENIC_E1:

		cpu_probe_ingenic(c, cpu);

		break;

	case PRID_COMP_NETLOGIC: