Commit a92b0588 authored by Daniel Laird's avatar Daniel Laird Committed by Ralf Baechle

[MIPS] Move arch/mips/philips to arch/mips/nxp

Signed-off-by: default avatardaniel.j.laird <daniel.j.laird@nxp.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 389310e2
...@@ -310,12 +310,12 @@ config MACH_VR41XX ...@@ -310,12 +310,12 @@ config MACH_VR41XX
select GENERIC_HARDIRQS_NO__DO_IRQ select GENERIC_HARDIRQS_NO__DO_IRQ
config PNX8550_JBS config PNX8550_JBS
bool "Philips PNX8550 based JBS board" bool "NXP PNX8550 based JBS board"
select PNX8550 select PNX8550
select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN
config PNX8550_STB810 config PNX8550_STB810
bool "Philips PNX8550 based STB810 board" bool "NXP PNX8550 based STB810 board"
select PNX8550 select PNX8550
select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN
......
...@@ -410,21 +410,21 @@ load-$(CONFIG_CASIO_E55) += 0xffffffff80004000 ...@@ -410,21 +410,21 @@ load-$(CONFIG_CASIO_E55) += 0xffffffff80004000
load-$(CONFIG_TANBAC_TB022X) += 0xffffffff80000000 load-$(CONFIG_TANBAC_TB022X) += 0xffffffff80000000
# #
# Common Philips PNX8550 # Common NXP PNX8550
# #
core-$(CONFIG_SOC_PNX8550) += arch/mips/philips/pnx8550/common/ core-$(CONFIG_SOC_PNX8550) += arch/mips/nxp/pnx8550/common/
cflags-$(CONFIG_SOC_PNX8550) += -Iinclude/asm-mips/mach-pnx8550 cflags-$(CONFIG_SOC_PNX8550) += -Iinclude/asm-mips/mach-pnx8550
# #
# Philips PNX8550 JBS board # NXP PNX8550 JBS board
# #
libs-$(CONFIG_PNX8550_JBS) += arch/mips/philips/pnx8550/jbs/ libs-$(CONFIG_PNX8550_JBS) += arch/mips/nxp/pnx8550/jbs/
#cflags-$(CONFIG_PNX8550_JBS) += -Iinclude/asm-mips/mach-pnx8550 #cflags-$(CONFIG_PNX8550_JBS) += -Iinclude/asm-mips/mach-pnx8550
load-$(CONFIG_PNX8550_JBS) += 0xffffffff80060000 load-$(CONFIG_PNX8550_JBS) += 0xffffffff80060000
# Philips PNX8550 STB810 board # NXP PNX8550 STB810 board
# #
libs-$(CONFIG_PNX8550_STB810) += arch/mips/philips/pnx8550/stb810/ libs-$(CONFIG_PNX8550_STB810) += arch/mips/nxp/pnx8550/stb810/
load-$(CONFIG_PNX8550_STB810) += 0xffffffff80060000 load-$(CONFIG_PNX8550_STB810) += 0xffffffff80060000
# NEC EMMA2RH boards # NEC EMMA2RH boards
......
...@@ -790,7 +790,7 @@ static inline void cpu_probe_sandcraft(struct cpuinfo_mips *c) ...@@ -790,7 +790,7 @@ static inline void cpu_probe_sandcraft(struct cpuinfo_mips *c)
} }
} }
static inline void cpu_probe_philips(struct cpuinfo_mips *c) static inline void cpu_probe_nxp(struct cpuinfo_mips *c)
{ {
decode_configs(c); decode_configs(c);
switch (c->processor_id & 0xff00) { switch (c->processor_id & 0xff00) {
...@@ -799,7 +799,7 @@ static inline void cpu_probe_philips(struct cpuinfo_mips *c) ...@@ -799,7 +799,7 @@ static inline void cpu_probe_philips(struct cpuinfo_mips *c)
c->isa_level = MIPS_CPU_ISA_M32R1; c->isa_level = MIPS_CPU_ISA_M32R1;
break; break;
default: default:
panic("Unknown Philips Core!"); /* REVISIT: die? */ panic("Unknown NXP Core!"); /* REVISIT: die? */
break; break;
} }
} }
...@@ -938,8 +938,8 @@ __cpuinit void cpu_probe(void) ...@@ -938,8 +938,8 @@ __cpuinit void cpu_probe(void)
case PRID_COMP_SANDCRAFT: case PRID_COMP_SANDCRAFT:
cpu_probe_sandcraft(c); cpu_probe_sandcraft(c);
break; break;
case PRID_COMP_PHILIPS: case PRID_COMP_NXP:
cpu_probe_philips(c); cpu_probe_nxp(c);
break; break;
default: default:
c->cputype = CPU_UNKNOWN; c->cputype = CPU_UNKNOWN;
......
/* /*
* Platform device support for Philips PNX8550 SoCs * Platform device support for NXP PNX8550 SoCs
* *
* Copyright 2005, Embedded Alley Solutions, Inc * Copyright 2005, Embedded Alley Solutions, Inc
* *
......
# Makefile for the Philips JBS Board. # Makefile for the NXP JBS Board.
lib-y := init.o board_setup.o irqmap.o lib-y := init.o board_setup.o irqmap.o
...@@ -53,8 +53,8 @@ void __init board_setup(void) ...@@ -53,8 +53,8 @@ void __init board_setup(void)
/* clear all three cache coherency fields */ /* clear all three cache coherency fields */
config0 &= ~(0x7 | (7<<25) | (7<<28)); config0 &= ~(0x7 | (7<<25) | (7<<28));
config0 |= (_page_cachable_default >> _CACHE_SHIFT) | config0 |= (CONF_CM_DEFAULT | (CONF_CM_DEFAULT<<25) |
(CONF_CM_DEFAULT << 25) | (CONF_CM_DEFAULT << 28); (CONF_CM_DEFAULT<<28));
write_c0_config(config0); write_c0_config(config0);
BARRIER; BARRIER;
......
...@@ -40,7 +40,7 @@ extern char *prom_getenv(char *envname); ...@@ -40,7 +40,7 @@ extern char *prom_getenv(char *envname);
const char *get_system_type(void) const char *get_system_type(void)
{ {
return "Philips PNX8550/JBS"; return "NXP PNX8550/JBS";
} }
void __init prom_init(void) void __init prom_init(void)
......
/* /*
* Philips JBS board irqmap. * NXP JBS board irqmap.
* *
* Copyright 2005 Embedded Alley Solutions, Inc * Copyright 2005 Embedded Alley Solutions, Inc
* source@embeddealley.com * source@embeddealley.com
...@@ -33,4 +33,3 @@ char pnx8550_irq_tab[][5] __initdata = { ...@@ -33,4 +33,3 @@ char pnx8550_irq_tab[][5] __initdata = {
[9] = { -1, PNX8550_INT_PCI_INTA, 0xff, 0xff, 0xff}, [9] = { -1, PNX8550_INT_PCI_INTA, 0xff, 0xff, 0xff},
[17] = { -1, PNX8550_INT_PCI_INTA, 0xff, 0xff, 0xff}, [17] = { -1, PNX8550_INT_PCI_INTA, 0xff, 0xff, 0xff},
}; };
# Makefile for the Philips STB810 Board. # Makefile for the NXP STB810 Board.
lib-y := prom_init.o board_setup.o irqmap.o lib-y := prom_init.o board_setup.o irqmap.o
/* /*
* STB810 specific board startup routines. * STB810 specific board startup routines.
* *
* Based on the arch/mips/philips/pnx8550/jbs/board_setup.c * Based on the arch/mips/nxp/pnx8550/jbs/board_setup.c
* *
* Author: MontaVista Software, Inc. * Author: MontaVista Software, Inc.
* source@mvista.com * source@mvista.com
...@@ -39,8 +39,8 @@ void __init board_setup(void) ...@@ -39,8 +39,8 @@ void __init board_setup(void)
/* clear all three cache coherency fields */ /* clear all three cache coherency fields */
config0 &= ~(0x7 | (7<<25) | (7<<28)); config0 &= ~(0x7 | (7<<25) | (7<<28));
config0 |= (_page_cachable_default >> _CACHE_SHIFT) | config0 |= (CONF_CM_DEFAULT | (CONF_CM_DEFAULT<<25) |
(CONF_CM_DEFAULT << 25) | (CONF_CM_DEFAULT << 28); (CONF_CM_DEFAULT<<28));
write_c0_config(config0); write_c0_config(config0);
configpr = read_c0_config7(); configpr = read_c0_config7();
......
/* /*
* Philips STB810 board irqmap. * NXP STB810 board irqmap.
* *
* Author: MontaVista Software, Inc. * Author: MontaVista Software, Inc.
* source@mvista.com * source@mvista.com
...@@ -20,4 +20,3 @@ char pnx8550_irq_tab[][5] __initdata = { ...@@ -20,4 +20,3 @@ char pnx8550_irq_tab[][5] __initdata = {
[9] = { -1, PNX8550_INT_PCI_INTA, 0xff, 0xff, 0xff}, [9] = { -1, PNX8550_INT_PCI_INTA, 0xff, 0xff, 0xff},
[10] = { -1, PNX8550_INT_PCI_INTA, 0xff, 0xff, 0xff}, [10] = { -1, PNX8550_INT_PCI_INTA, 0xff, 0xff, 0xff},
}; };
...@@ -28,7 +28,7 @@ extern char *prom_getenv(char *envname); ...@@ -28,7 +28,7 @@ extern char *prom_getenv(char *envname);
const char *get_system_type(void) const char *get_system_type(void)
{ {
return "Philips PNX8550/STB810"; return "NXP PNX8950/STB810";
} }
void __init prom_init(void) void __init prom_init(void)
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#define PRID_COMP_ALCHEMY 0x030000 #define PRID_COMP_ALCHEMY 0x030000
#define PRID_COMP_SIBYTE 0x040000 #define PRID_COMP_SIBYTE 0x040000
#define PRID_COMP_SANDCRAFT 0x050000 #define PRID_COMP_SANDCRAFT 0x050000
#define PRID_COMP_PHILIPS 0x060000 #define PRID_COMP_NXP 0x060000
#define PRID_COMP_TOSHIBA 0x070000 #define PRID_COMP_TOSHIBA 0x070000
#define PRID_COMP_LSI 0x080000 #define PRID_COMP_LSI 0x080000
#define PRID_COMP_LEXRA 0x0b0000 #define PRID_COMP_LEXRA 0x0b0000
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment