p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

MIPS: Rename JZRISC to XBURST 

The real name of the CPU present in the JZ line of SoCs from Ingenic is
XBurst, not JZRISC.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
[paul.burton@mips.com: Leave /proc/cpuinfo string as-is.]
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: od@zcrc.me
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
This commit is contained in:
Paul Cercueil 2019-05-08 00:43:56 +02:00 committed by Paul Burton
parent 7176b6ac18
commit 3b25b76311
No known key found for this signature in database
GPG Key ID: 3EA79FACB57500DD
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/include/asm/cpu-type.h
View File

@ -38,7 +38,7 @@ static inline int __pure __get_cpu_type(const int cpu_type)
#if defined(CONFIG_SYS_HAS_CPU_MIPS32_R1) || \ #if defined(CONFIG_SYS_HAS_CPU_MIPS32_R1) || \
defined(CONFIG_SYS_HAS_CPU_MIPS32_R2) defined(CONFIG_SYS_HAS_CPU_MIPS32_R2)
case CPU_4KEC: case CPU_4KEC:
case CPU_JZRISC: case CPU_XBURST:
#endif #endif
#ifdef CONFIG_SYS_HAS_CPU_MIPS32_R2 #ifdef CONFIG_SYS_HAS_CPU_MIPS32_R2

4
arch/mips/include/asm/cpu.h
View File

@ -183,7 +183,7 @@
* 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 #define PRID_IMP_XBURST 0x0200
/* /*
* These are the PRID's for when 23:16 == PRID_COMP_NETLOGIC * These are the PRID's for when 23:16 == PRID_COMP_NETLOGIC
@ -315,7 +315,7 @@ enum cpu_type_enum {
*/ */
CPU_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_1004K, CPU_74K, CPU_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_1004K, CPU_74K,
CPU_ALCHEMY, CPU_PR4450, CPU_BMIPS32, CPU_BMIPS3300, CPU_BMIPS4350, CPU_ALCHEMY, CPU_PR4450, CPU_BMIPS32, CPU_BMIPS3300, CPU_BMIPS4350,
CPU_BMIPS4380, CPU_BMIPS5000, CPU_JZRISC, CPU_LOONGSON1, CPU_M14KC, CPU_BMIPS4380, CPU_BMIPS5000, CPU_XBURST, CPU_LOONGSON1, CPU_M14KC,
CPU_M14KEC, CPU_INTERAPTIV, CPU_P5600, CPU_PROAPTIV, CPU_1074K, CPU_M14KEC, CPU_INTERAPTIV, CPU_P5600, CPU_PROAPTIV, CPU_1074K,
CPU_M5150, CPU_I6400, CPU_P6600, CPU_M6250, CPU_M5150, CPU_I6400, CPU_P6600, CPU_M6250,

6
arch/mips/kernel/cpu-probe.c
View File

@ -1956,12 +1956,12 @@ static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu)
static inline void cpu_probe_ingenic(struct cpuinfo_mips *c, unsigned int cpu) static inline void cpu_probe_ingenic(struct cpuinfo_mips *c, unsigned int cpu)
{ {
decode_configs(c); decode_configs(c);
/* JZRISC does not implement the CP0 counter. */ /* XBurst does not implement the CP0 counter. */
c->options &= ~MIPS_CPU_COUNTER; c->options &= ~MIPS_CPU_COUNTER;
BUG_ON(!__builtin_constant_p(cpu_has_counter) || cpu_has_counter); BUG_ON(!__builtin_constant_p(cpu_has_counter) || cpu_has_counter);
switch (c->processor_id & PRID_IMP_MASK) { switch (c->processor_id & PRID_IMP_MASK) {
case PRID_IMP_JZRISC: case PRID_IMP_XBURST:
c->cputype = CPU_JZRISC; c->cputype = CPU_XBURST;
c->writecombine = _CACHE_UNCACHED_ACCELERATED; c->writecombine = _CACHE_UNCACHED_ACCELERATED;
__cpu_name[cpu] = "Ingenic JZRISC"; __cpu_name[cpu] = "Ingenic JZRISC";
break; break;

2
arch/mips/kernel/idle.c
View File

@ -173,7 +173,7 @@ void __init check_wait(void)
case CPU_CAVIUM_OCTEON_PLUS: case CPU_CAVIUM_OCTEON_PLUS:
case CPU_CAVIUM_OCTEON2: case CPU_CAVIUM_OCTEON2:
case CPU_CAVIUM_OCTEON3: case CPU_CAVIUM_OCTEON3:
case CPU_JZRISC: case CPU_XBURST:
case CPU_LOONGSON1: case CPU_LOONGSON1:
case CPU_XLR: case CPU_XLR:
case CPU_XLP: case CPU_XLP:

2
arch/mips/mm/sc-mips.c
View File

@ -225,7 +225,7 @@ static inline int __init mips_sc_probe(void)
* According to config2 it would be 5-ways, but that is contradicted * According to config2 it would be 5-ways, but that is contradicted
* by all documentation. * by all documentation.
*/ */
if (current_cpu_type() == CPU_JZRISC && if (current_cpu_type() == CPU_XBURST &&
mips_machtype == MACH_INGENIC_JZ4770) mips_machtype == MACH_INGENIC_JZ4770)
c->scache.ways = 4; c->scache.ways = 4;

2
arch/mips/mm/tlbex.c
View File

@ -610,7 +610,7 @@ void build_tlb_write_entry(u32 **p, struct uasm_label **l,
tlbw(p); tlbw(p);
break; break;
case CPU_JZRISC: case CPU_XBURST:
tlbw(p); tlbw(p);
uasm_i_nop(p); uasm_i_nop(p);
break; break;