---

yaml --- r: 101452 b: refs/heads/master c: 22b1d70 h: refs/heads/master v: v3
git-mirror · Jul 15, 2008 · 93dec56 · 93dec56
1 parent 676b29c
commit 93dec56
Show file tree

Hide file tree

Showing 50 changed files with 105 additions and 218 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14476007c90005c8992b786c15a59cca31f53268
+refs/heads/master: 22b1d707ffc99faebd86257ad19d5bb9fc624734
diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
@@ -642,8 +642,7 @@ source "arch/mips/lasat/Kconfig"
 source "arch/mips/pmc-sierra/Kconfig"
 source "arch/mips/sgi-ip27/Kconfig"
 source "arch/mips/sibyte/Kconfig"
-source "arch/mips/tx4927/Kconfig"
-source "arch/mips/tx4938/Kconfig"
+source "arch/mips/txx9/Kconfig"
 source "arch/mips/vr41xx/Kconfig"
 
 endmenu

diff --git a/trunk/arch/mips/Makefile b/trunk/arch/mips/Makefile
@@ -553,25 +553,25 @@ all-$(CONFIG_SNI_RM)		:= vmlinux.ecoff
 #
 # Toshiba JMR-TX3927 board
 #
-core-$(CONFIG_TOSHIBA_JMR3927)	+= arch/mips/jmr3927/rbhma3100/ \
-				   arch/mips/jmr3927/common/
+core-$(CONFIG_TOSHIBA_JMR3927)	+= arch/mips/txx9/jmr3927/ \
+				   arch/mips/txx9/generic/
 cflags-$(CONFIG_TOSHIBA_JMR3927) += -Iinclude/asm-mips/mach-jmr3927
 load-$(CONFIG_TOSHIBA_JMR3927)	+= 0xffffffff80050000
 
 #
 # Toshiba RBTX4927 board or
 # Toshiba RBTX4937 board
 #
-core-$(CONFIG_TOSHIBA_RBTX4927)	+= arch/mips/tx4927/toshiba_rbtx4927/
-core-$(CONFIG_TOSHIBA_RBTX4927)	+= arch/mips/tx4927/common/
+core-$(CONFIG_TOSHIBA_RBTX4927)	+= arch/mips/txx9/rbtx4927/
+core-$(CONFIG_TOSHIBA_RBTX4927)	+= arch/mips/txx9/generic/
 cflags-$(CONFIG_TOSHIBA_RBTX4927) += -Iinclude/asm-mips/mach-tx49xx
 load-$(CONFIG_TOSHIBA_RBTX4927)	+= 0xffffffff80020000
 
 #
 # Toshiba RBTX4938 board
 #
-core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/toshiba_rbtx4938/
-core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/common/
+core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/txx9/rbtx4938/
+core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/txx9/generic/
 cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
 load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
 

diff --git a/trunk/arch/mips/jmr3927/common/Makefile b/trunk/arch/mips/jmr3927/common/Makefile
diff --git a/trunk/arch/mips/jmr3927/common/puts.c b/trunk/arch/mips/jmr3927/common/puts.c
diff --git a/trunk/arch/mips/pci/Makefile b/trunk/arch/mips/pci/Makefile
@@ -43,7 +43,7 @@ obj-$(CONFIG_TANBAC_TB0226)	+= fixup-tb0226.o
 obj-$(CONFIG_TANBAC_TB0287)	+= fixup-tb0287.o
 obj-$(CONFIG_TOSHIBA_JMR3927)	+= fixup-jmr3927.o pci-jmr3927.o
 obj-$(CONFIG_TOSHIBA_RBTX4927)	+= fixup-rbtx4927.o ops-tx4927.o
-obj-$(CONFIG_TOSHIBA_RBTX4938)	+= fixup-tx4938.o ops-tx4938.o
+obj-$(CONFIG_TOSHIBA_RBTX4938)	+= fixup-rbtx4938.o ops-tx4938.o
 obj-$(CONFIG_VICTOR_MPC30X)	+= fixup-mpc30x.o
 obj-$(CONFIG_ZAO_CAPCELLA)	+= fixup-capcella.o
 obj-$(CONFIG_WR_PPMC)		+= fixup-wrppmc.o
diff --git a/trunk/arch/mips/pci/fixup-jmr3927.c b/trunk/arch/mips/pci/fixup-jmr3927.c
@@ -31,7 +31,7 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 
-#include <asm/jmr3927/jmr3927.h>
+#include <asm/txx9/jmr3927.h>
 
 int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {

diff --git a/trunk/arch/mips/pci/fixup-rbtx4927.c b/trunk/arch/mips/pci/fixup-rbtx4927.c
@@ -37,7 +37,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 
-#include <asm/tx4927/tx4927.h>
+#include <asm/txx9/tx4927.h>
 
 #undef  DEBUG
 #ifdef  DEBUG

diff --git a/trunk/arch/mips/pci/fixup-tx4938.c → trunk/arch/mips/pci/fixup-rbtx4938.c b/trunk/arch/mips/pci/fixup-tx4938.c → trunk/arch/mips/pci/fixup-rbtx4938.c
@@ -14,7 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 
-#include <asm/tx4938/rbtx4938.h>
+#include <asm/txx9/rbtx4938.h>
 
 extern struct pci_controller tx4938_pci_controller[];
 

diff --git a/trunk/arch/mips/pci/ops-tx3927.c b/trunk/arch/mips/pci/ops-tx3927.c
@@ -39,7 +39,7 @@
 #include <linux/init.h>
 
 #include <asm/addrspace.h>
-#include <asm/jmr3927/jmr3927.h>
+#include <asm/txx9/jmr3927.h>
 
 static inline int mkaddr(unsigned char bus, unsigned char dev_fn,
 	unsigned char where)

diff --git a/trunk/arch/mips/pci/ops-tx4927.c b/trunk/arch/mips/pci/ops-tx4927.c
@@ -40,7 +40,7 @@
 #include <linux/pci.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <asm/tx4927/tx4927.h>
+#include <asm/txx9/tx4927.h>
 
 /* initialize in setup */
 struct resource pci_io_resource = {

diff --git a/trunk/arch/mips/pci/ops-tx4938.c b/trunk/arch/mips/pci/ops-tx4938.c
@@ -15,7 +15,7 @@
 #include <linux/init.h>
 
 #include <asm/addrspace.h>
-#include <asm/tx4938/rbtx4938.h>
+#include <asm/txx9/rbtx4938.h>
 
 /* initialize in setup */
 struct resource pci_io_resource = {

diff --git a/trunk/arch/mips/pci/pci-jmr3927.c b/trunk/arch/mips/pci/pci-jmr3927.c
@@ -31,7 +31,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 
-#include <asm/jmr3927/jmr3927.h>
+#include <asm/txx9/jmr3927.h>
 #include <asm/debug.h>
 
 struct resource pci_io_resource = {

diff --git a/trunk/arch/mips/tx4927/Kconfig b/trunk/arch/mips/tx4927/Kconfig
diff --git a/trunk/arch/mips/tx4927/common/Makefile b/trunk/arch/mips/tx4927/common/Makefile
diff --git a/trunk/arch/mips/tx4927/common/tx4927_dbgio.c b/trunk/arch/mips/tx4927/common/tx4927_dbgio.c
diff --git a/trunk/arch/mips/tx4927/toshiba_rbtx4927/Makefile b/trunk/arch/mips/tx4927/toshiba_rbtx4927/Makefile
diff --git a/trunk/arch/mips/tx4938/common/Makefile b/trunk/arch/mips/tx4938/common/Makefile
diff --git a/trunk/arch/mips/tx4938/Kconfig → trunk/arch/mips/txx9/Kconfig b/trunk/arch/mips/tx4938/Kconfig → trunk/arch/mips/txx9/Kconfig
@@ -1,3 +1,7 @@
+config TOSHIBA_FPCIB0
+	bool "FPCIB0 Backplane Support"
+	depends on TOSHIBA_RBTX4927
+
 if TOSHIBA_RBTX4938
 
 comment "Multiplex Pin Select"

diff --git a/trunk/arch/mips/txx9/generic/Makefile b/trunk/arch/mips/txx9/generic/Makefile
@@ -0,0 +1,10 @@
+#
+# Makefile for common code for TXx9 based systems
+#
+
+obj-$(CONFIG_TOSHIBA_RBTX4927)	+= mem_tx4927.o irq_tx4927.o
+obj-$(CONFIG_TOSHIBA_RBTX4938)	+= mem_tx4938.o irq_tx4938.o
+obj-$(CONFIG_TOSHIBA_FPCIB0)	+= smsc_fdc37m81x.o
+obj-$(CONFIG_KGDB)	+= dbgio.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/trunk/arch/mips/tx4938/common/dbgio.c → trunk/arch/mips/txx9/generic/dbgio.c b/trunk/arch/mips/tx4938/common/dbgio.c → trunk/arch/mips/txx9/generic/dbgio.c
diff --git a/trunk/arch/mips/tx4927/common/tx4927_irq.c → trunk/arch/mips/txx9/generic/irq_tx4927.c b/trunk/arch/mips/tx4927/common/tx4927_irq.c → trunk/arch/mips/txx9/generic/irq_tx4927.c
@@ -27,9 +27,8 @@
 #include <linux/interrupt.h>
 #include <asm/irq_cpu.h>
 #include <asm/mipsregs.h>
-#include <asm/tx4927/tx4927.h>
 #ifdef CONFIG_TOSHIBA_RBTX4927
-#include <asm/tx4927/toshiba_rbtx4927.h>
+#include <asm/txx9/rbtx4927.h>
 #endif
 
 void __init tx4927_irq_init(void)

diff --git a/trunk/arch/mips/tx4938/common/irq.c → trunk/arch/mips/txx9/generic/irq_tx4938.c b/trunk/arch/mips/tx4938/common/irq.c → trunk/arch/mips/txx9/generic/irq_tx4938.c
@@ -15,7 +15,7 @@
 #include <linux/interrupt.h>
 #include <asm/irq_cpu.h>
 #include <asm/mipsregs.h>
-#include <asm/tx4938/rbtx4938.h>
+#include <asm/txx9/rbtx4938.h>
 
 void __init
 tx4938_irq_init(void)

diff --git a/trunk/arch/mips/tx4927/common/tx4927_prom.c → trunk/arch/mips/txx9/generic/mem_tx4927.c b/trunk/arch/mips/tx4927/common/tx4927_prom.c → trunk/arch/mips/txx9/generic/mem_tx4927.c
@@ -32,7 +32,6 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/io.h>
-#include <asm/tx4927/tx4927.h>
 
 static unsigned int __init tx4927_process_sdccr(unsigned long addr)
 {

diff --git a/trunk/arch/mips/tx4938/common/prom.c → trunk/arch/mips/txx9/generic/mem_tx4938.c b/trunk/arch/mips/tx4938/common/prom.c → trunk/arch/mips/txx9/generic/mem_tx4938.c
diff --git a/.../arch/mips/tx4927/common/smsc_fdc37m81x.c → ...k/arch/mips/txx9/generic/smsc_fdc37m81x.c b/.../arch/mips/tx4927/common/smsc_fdc37m81x.c → ...k/arch/mips/txx9/generic/smsc_fdc37m81x.c
@@ -13,7 +13,7 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <asm/io.h>
-#include <asm/tx4927/smsc_fdc37m81x.h>
+#include <asm/txx9/smsc_fdc37m81x.h>
 
 #define DEBUG
 

diff --git a/trunk/arch/mips/jmr3927/rbhma3100/Makefile → trunk/arch/mips/txx9/jmr3927/Makefile b/trunk/arch/mips/jmr3927/rbhma3100/Makefile → trunk/arch/mips/txx9/jmr3927/Makefile
@@ -2,7 +2,7 @@
 # Makefile for TOSHIBA JMR-TX3927 board
 #
 
-obj-y	 			+= init.o irq.o setup.o
-obj-$(CONFIG_KGDB)		+= kgdb_io.o
+obj-y	+= prom.o init.o irq.o setup.o
+obj-$(CONFIG_KGDB)	+= kgdb_io.o
 
 EXTRA_CFLAGS += -Werror
diff --git a/trunk/arch/mips/jmr3927/rbhma3100/init.c → trunk/arch/mips/txx9/jmr3927/init.c b/trunk/arch/mips/jmr3927/rbhma3100/init.c → trunk/arch/mips/txx9/jmr3927/init.c
@@ -29,7 +29,7 @@
  */
 #include <linux/init.h>
 #include <asm/bootinfo.h>
-#include <asm/jmr3927/jmr3927.h>
+#include <asm/txx9/jmr3927.h>
 
 extern void  __init prom_init_cmdline(void);
 

diff --git a/trunk/arch/mips/jmr3927/rbhma3100/irq.c → trunk/arch/mips/txx9/jmr3927/irq.c b/trunk/arch/mips/jmr3927/rbhma3100/irq.c → trunk/arch/mips/txx9/jmr3927/irq.c
@@ -39,7 +39,7 @@
 #include <asm/system.h>
 
 #include <asm/processor.h>
-#include <asm/jmr3927/jmr3927.h>
+#include <asm/txx9/jmr3927.h>
 
 #if JMR3927_IRQ_END > NR_IRQS
 #error JMR3927_IRQ_END > NR_IRQS

diff --git a/trunk/arch/mips/jmr3927/rbhma3100/kgdb_io.c → trunk/arch/mips/txx9/jmr3927/kgdb_io.c b/trunk/arch/mips/jmr3927/rbhma3100/kgdb_io.c → trunk/arch/mips/txx9/jmr3927/kgdb_io.c
@@ -31,7 +31,7 @@
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <asm/jmr3927/jmr3927.h>
+#include <asm/txx9/jmr3927.h>
 
 #define TIMEOUT       0xffffff
 

diff --git a/trunk/arch/mips/jmr3927/common/prom.c → trunk/arch/mips/txx9/jmr3927/prom.c b/trunk/arch/mips/jmr3927/common/prom.c → trunk/arch/mips/txx9/jmr3927/prom.c
@@ -40,6 +40,7 @@
 #include <linux/string.h>
 
 #include <asm/bootinfo.h>
+#include <asm/txx9/tx3927.h>
 
 char * __init prom_getcmdline(void)
 {
@@ -70,3 +71,28 @@ void  __init prom_init_cmdline(void)
 void __init prom_free_prom_memory(void)
 {
 }
+
+#define TIMEOUT       0xffffff
+
+void
+prom_putchar(char c)
+{
+        int i = 0;
+
+        do {
+            i++;
+            if (i>TIMEOUT)
+                break;
+        } while (!(tx3927_sioptr(1)->cisr & TXx927_SICISR_TXALS));
+	tx3927_sioptr(1)->tfifo = c;
+	return;
+}
+
+void
+puts(const char *cp)
+{
+    while (*cp)
+	prom_putchar(*cp++);
+    prom_putchar('\r');
+    prom_putchar('\n');
+}
diff --git a/trunk/arch/mips/jmr3927/rbhma3100/setup.c → trunk/arch/mips/txx9/jmr3927/setup.c b/trunk/arch/mips/jmr3927/rbhma3100/setup.c → trunk/arch/mips/txx9/jmr3927/setup.c
@@ -44,7 +44,7 @@
 #include <asm/txx9tmr.h>
 #include <asm/txx9pio.h>
 #include <asm/reboot.h>
-#include <asm/jmr3927/jmr3927.h>
+#include <asm/txx9/jmr3927.h>
 #include <asm/mipsregs.h>
 
 extern void puts(const char *cp);