renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 18:53:52 +08:00
Code

MIPS: Netlogic: Identify XLP 9XX chip

Browse Source 
Adds processor ID of XLP 9XX to asm/cpu.h.  Update netlogic/xlp-hal/xlp.h
to add cpu_is_xlp9xx() and to update cpu_is_xlpii() to support XLP 9XX.

Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Signed-off-by: John Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6274/
This commit is contained in:
Jayachandran C 2013-12-21 16:52:20 +05:30 committed by Ralf Baechle
parent db038feedd
commit 8907c55e72
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,6 +198,7 @@
#define PRID_IMP_NETLOGIC_XLP8XX 0x1000 #define PRID_IMP_NETLOGIC_XLP8XX 0x1000
#define PRID_IMP_NETLOGIC_XLP3XX 0x1100 #define PRID_IMP_NETLOGIC_XLP3XX 0x1100
#define PRID_IMP_NETLOGIC_XLP2XX 0x1200 #define PRID_IMP_NETLOGIC_XLP2XX 0x1200
#define PRID_IMP_NETLOGIC_XLP9XX 0x1500
/* /*
* Particular Revision values for bits 7:0 of the PRId register. * Particular Revision values for bits 7:0 of the PRId register.

9
arch/mips/include/asm/netlogic/xlp-hal/xlp.h
View File

@ -92,8 +92,15 @@ static inline int cpu_is_xlpii(void)
{ {
int chip = read_c0_prid() & 0xff00; int chip = read_c0_prid() & 0xff00;
return chip == PRID_IMP_NETLOGIC_XLP2XX; return chip == PRID_IMP_NETLOGIC_XLP2XX ||
chip == PRID_IMP_NETLOGIC_XLP9XX;
} }
static inline int cpu_is_xlp9xx(void)
{
int chip = read_c0_prid() & 0xff00;
return chip == PRID_IMP_NETLOGIC_XLP9XX;
}
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
#endif /* _ASM_NLM_XLP_H */ #endif /* _ASM_NLM_XLP_H */

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

@ -1031,6 +1031,7 @@ static inline void cpu_probe_netlogic(struct cpuinfo_mips *c, int cpu)
switch (c->processor_id & PRID_IMP_MASK) { switch (c->processor_id & PRID_IMP_MASK) {
case PRID_IMP_NETLOGIC_XLP2XX: case PRID_IMP_NETLOGIC_XLP2XX:
case PRID_IMP_NETLOGIC_XLP9XX:
c->cputype = CPU_XLP; c->cputype = CPU_XLP;
__cpu_name[cpu] = "Broadcom XLPII"; __cpu_name[cpu] = "Broadcom XLPII";
break; break;

1
arch/mips/netlogic/xlp/setup.c
View File

@ -111,6 +111,7 @@ void __init plat_mem_setup(void)
const char *get_system_type(void) const char *get_system_type(void)
{ {
switch (read_c0_prid() & 0xff00) { switch (read_c0_prid() & 0xff00) {
case PRID_IMP_NETLOGIC_XLP9XX:
case PRID_IMP_NETLOGIC_XLP2XX: case PRID_IMP_NETLOGIC_XLP2XX:
return "Broadcom XLPII Series"; return "Broadcom XLPII Series";
default: default: