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

Signed-off-by: daniel.j.laird <[email protected]> Signed-off-by: Ralf Baechle <[email protected]>
yshchan · Apr 28, 2008 · a92b058 · a92b058
1 parent 389310e
commit a92b058
Show file tree

Hide file tree

Showing 22 changed files with 25 additions and 27 deletions.
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
@@ -310,12 +310,12 @@ config MACH_VR41XX
 	select GENERIC_HARDIRQS_NO__DO_IRQ
 
 config PNX8550_JBS
-	bool "Philips PNX8550 based JBS board"
+	bool "NXP PNX8550 based JBS board"
 	select PNX8550
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config PNX8550_STB810
-	bool "Philips PNX8550 based STB810 board"
+	bool "NXP PNX8550 based STB810 board"
 	select PNX8550
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
@@ -410,21 +410,21 @@ load-$(CONFIG_CASIO_E55)	+= 0xffffffff80004000
 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
 
 #
-# 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
 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
 
 # NEC EMMA2RH boards

diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.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);
 	switch (c->processor_id & 0xff00) {
@@ -799,7 +799,7 @@ static inline void cpu_probe_philips(struct cpuinfo_mips *c)
 		c->isa_level = MIPS_CPU_ISA_M32R1;
 		break;
 	default:
-		panic("Unknown Philips Core!"); /* REVISIT: die? */
+		panic("Unknown NXP Core!"); /* REVISIT: die? */
 		break;
 	}
 }
@@ -938,8 +938,8 @@ __cpuinit void cpu_probe(void)
 	case PRID_COMP_SANDCRAFT:
 		cpu_probe_sandcraft(c);
 		break;
- 	case PRID_COMP_PHILIPS:
-		cpu_probe_philips(c);
+	case PRID_COMP_NXP:
+		cpu_probe_nxp(c);
 		break;
 	default:
 		c->cputype = CPU_UNKNOWN;

diff --git a/arch/mips/philips/pnx8550/common/Makefile → arch/mips/nxp/pnx8550/common/Makefile b/arch/mips/philips/pnx8550/common/Makefile → arch/mips/nxp/pnx8550/common/Makefile
diff --git a/arch/mips/philips/pnx8550/common/gdb_hook.c → arch/mips/nxp/pnx8550/common/gdb_hook.c b/arch/mips/philips/pnx8550/common/gdb_hook.c → arch/mips/nxp/pnx8550/common/gdb_hook.c
diff --git a/arch/mips/philips/pnx8550/common/int.c → arch/mips/nxp/pnx8550/common/int.c b/arch/mips/philips/pnx8550/common/int.c → arch/mips/nxp/pnx8550/common/int.c
diff --git a/arch/mips/philips/pnx8550/common/pci.c → arch/mips/nxp/pnx8550/common/pci.c b/arch/mips/philips/pnx8550/common/pci.c → arch/mips/nxp/pnx8550/common/pci.c
diff --git a/arch/mips/philips/pnx8550/common/platform.c → arch/mips/nxp/pnx8550/common/platform.c b/arch/mips/philips/pnx8550/common/platform.c → arch/mips/nxp/pnx8550/common/platform.c
@@ -1,5 +1,5 @@
 /*
- * Platform device support for Philips PNX8550 SoCs
+ * Platform device support for NXP PNX8550 SoCs
  *
  * Copyright 2005, Embedded Alley Solutions, Inc
  *

diff --git a/arch/mips/philips/pnx8550/common/proc.c → arch/mips/nxp/pnx8550/common/proc.c b/arch/mips/philips/pnx8550/common/proc.c → arch/mips/nxp/pnx8550/common/proc.c
diff --git a/arch/mips/philips/pnx8550/common/prom.c → arch/mips/nxp/pnx8550/common/prom.c b/arch/mips/philips/pnx8550/common/prom.c → arch/mips/nxp/pnx8550/common/prom.c
diff --git a/arch/mips/philips/pnx8550/common/reset.c → arch/mips/nxp/pnx8550/common/reset.c b/arch/mips/philips/pnx8550/common/reset.c → arch/mips/nxp/pnx8550/common/reset.c
diff --git a/arch/mips/philips/pnx8550/common/setup.c → arch/mips/nxp/pnx8550/common/setup.c b/arch/mips/philips/pnx8550/common/setup.c → arch/mips/nxp/pnx8550/common/setup.c
diff --git a/arch/mips/philips/pnx8550/common/time.c → arch/mips/nxp/pnx8550/common/time.c b/arch/mips/philips/pnx8550/common/time.c → arch/mips/nxp/pnx8550/common/time.c
diff --git a/arch/mips/philips/pnx8550/jbs/Makefile → arch/mips/nxp/pnx8550/jbs/Makefile b/arch/mips/philips/pnx8550/jbs/Makefile → arch/mips/nxp/pnx8550/jbs/Makefile
@@ -1,4 +1,4 @@
 
-# Makefile for the Philips JBS Board.
+# Makefile for the NXP JBS Board.
 
 lib-y := init.o board_setup.o irqmap.o
diff --git a/arch/mips/philips/pnx8550/jbs/board_setup.c → arch/mips/nxp/pnx8550/jbs/board_setup.c b/arch/mips/philips/pnx8550/jbs/board_setup.c → arch/mips/nxp/pnx8550/jbs/board_setup.c
@@ -53,8 +53,8 @@ void __init board_setup(void)
 
 	/* clear all three cache coherency fields */
 	config0 &= ~(0x7 | (7<<25) | (7<<28));
-	config0 |= (_page_cachable_default >> _CACHE_SHIFT) |
-		   (CONF_CM_DEFAULT << 25) | (CONF_CM_DEFAULT << 28);
+	config0 |= (CONF_CM_DEFAULT | (CONF_CM_DEFAULT<<25) |
+			(CONF_CM_DEFAULT<<28));
 	write_c0_config(config0);
 	BARRIER;
 

diff --git a/arch/mips/philips/pnx8550/jbs/init.c → arch/mips/nxp/pnx8550/jbs/init.c b/arch/mips/philips/pnx8550/jbs/init.c → arch/mips/nxp/pnx8550/jbs/init.c
@@ -40,7 +40,7 @@ extern char *prom_getenv(char *envname);
 
 const char *get_system_type(void)
 {
-	return "Philips PNX8550/JBS";
+	return "NXP PNX8550/JBS";
 }
 
 void __init prom_init(void)

diff --git a/arch/mips/philips/pnx8550/jbs/irqmap.c → arch/mips/nxp/pnx8550/jbs/irqmap.c b/arch/mips/philips/pnx8550/jbs/irqmap.c → arch/mips/nxp/pnx8550/jbs/irqmap.c
@@ -1,5 +1,5 @@
 /*
- *  Philips JBS board irqmap.
+ *  NXP JBS board irqmap.
  *
  *  Copyright 2005 Embedded Alley Solutions, Inc
  *  [email protected]
@@ -33,4 +33,3 @@ char pnx8550_irq_tab[][5] __initdata = {
 	[9]	= { -1, PNX8550_INT_PCI_INTA, 0xff, 0xff, 0xff},
 	[17]	= { -1, PNX8550_INT_PCI_INTA, 0xff, 0xff, 0xff},
 };
-
diff --git a/arch/mips/philips/pnx8550/stb810/Makefile → arch/mips/nxp/pnx8550/stb810/Makefile b/arch/mips/philips/pnx8550/stb810/Makefile → arch/mips/nxp/pnx8550/stb810/Makefile
@@ -1,4 +1,4 @@
 
-# Makefile for the Philips STB810 Board.
+# Makefile for the NXP STB810 Board.
 
 lib-y := prom_init.o board_setup.o irqmap.o
diff --git a/...mips/philips/pnx8550/stb810/board_setup.c → arch/mips/nxp/pnx8550/stb810/board_setup.c b/...mips/philips/pnx8550/stb810/board_setup.c → arch/mips/nxp/pnx8550/stb810/board_setup.c
@@ -1,7 +1,7 @@
 /*
  *  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.
  *          [email protected]
@@ -39,8 +39,8 @@ void __init board_setup(void)
 
 	/* clear all three cache coherency fields */
 	config0 &= ~(0x7 | (7<<25) | (7<<28));
-	config0 |= (_page_cachable_default >> _CACHE_SHIFT) |
-		   (CONF_CM_DEFAULT << 25) | (CONF_CM_DEFAULT << 28);
+	config0 |= (CONF_CM_DEFAULT | (CONF_CM_DEFAULT<<25) |
+			(CONF_CM_DEFAULT<<28));
 	write_c0_config(config0);
 
 	configpr = read_c0_config7();

diff --git a/arch/mips/philips/pnx8550/stb810/irqmap.c → arch/mips/nxp/pnx8550/stb810/irqmap.c b/arch/mips/philips/pnx8550/stb810/irqmap.c → arch/mips/nxp/pnx8550/stb810/irqmap.c
@@ -1,5 +1,5 @@
 /*
- *  Philips STB810 board irqmap.
+ *  NXP STB810 board irqmap.
  *
  *  Author: MontaVista Software, Inc.
  *          [email protected]
@@ -20,4 +20,3 @@ char pnx8550_irq_tab[][5] __initdata = {
 	[9]	= { -1, PNX8550_INT_PCI_INTA, 0xff, 0xff, 0xff},
 	[10]	= { -1, PNX8550_INT_PCI_INTA, 0xff, 0xff, 0xff},
 };
-
diff --git a/arch/mips/philips/pnx8550/stb810/prom_init.c → arch/mips/nxp/pnx8550/stb810/prom_init.c b/arch/mips/philips/pnx8550/stb810/prom_init.c → arch/mips/nxp/pnx8550/stb810/prom_init.c
@@ -28,7 +28,7 @@ extern char *prom_getenv(char *envname);
 
 const char *get_system_type(void)
 {
-	return "Philips PNX8550/STB810";
+	return "NXP PNX8950/STB810";
 }
 
 void __init prom_init(void)

diff --git a/include/asm-mips/cpu.h b/include/asm-mips/cpu.h
@@ -29,7 +29,7 @@
 #define PRID_COMP_ALCHEMY	0x030000
 #define PRID_COMP_SIBYTE	0x040000
 #define PRID_COMP_SANDCRAFT	0x050000
-#define PRID_COMP_PHILIPS	0x060000
+#define PRID_COMP_NXP   	0x060000
 #define PRID_COMP_TOSHIBA	0x070000
 #define PRID_COMP_LSI		0x080000
 #define PRID_COMP_LEXRA		0x0b0000