aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>2008-07-10 11:31:36 -0400
committerRalf Baechle <ralf@linux-mips.org>2008-07-15 13:44:35 -0400
commit22b1d707ffc99faebd86257ad19d5bb9fc624734 (patch)
tree9bd0bcd3878611d74db29e17f3c6e951f4656e61 /arch/mips
parent14476007c90005c8992b786c15a59cca31f53268 (diff)
[MIPS] TXx9: Reorganize code
Move arch/mips/{jmr3927,tx4927,tx4938} into arch/mips/txx9/ tree. This will help more code sharing and maintainance. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/Kconfig3
-rw-r--r--arch/mips/Makefile12
-rw-r--r--arch/mips/jmr3927/common/Makefile7
-rw-r--r--arch/mips/jmr3927/common/puts.c60
-rw-r--r--arch/mips/pci/Makefile2
-rw-r--r--arch/mips/pci/fixup-jmr3927.c2
-rw-r--r--arch/mips/pci/fixup-rbtx4927.c2
-rw-r--r--arch/mips/pci/fixup-rbtx4938.c (renamed from arch/mips/pci/fixup-tx4938.c)2
-rw-r--r--arch/mips/pci/ops-tx3927.c2
-rw-r--r--arch/mips/pci/ops-tx4927.c2
-rw-r--r--arch/mips/pci/ops-tx4938.c2
-rw-r--r--arch/mips/pci/pci-jmr3927.c2
-rw-r--r--arch/mips/tx4927/Kconfig3
-rw-r--r--arch/mips/tx4927/common/Makefile10
-rw-r--r--arch/mips/tx4927/common/tx4927_dbgio.c43
-rw-r--r--arch/mips/tx4927/toshiba_rbtx4927/Makefile5
-rw-r--r--arch/mips/tx4938/common/Makefile8
-rw-r--r--arch/mips/txx9/Kconfig (renamed from arch/mips/tx4938/Kconfig)4
-rw-r--r--arch/mips/txx9/generic/Makefile10
-rw-r--r--arch/mips/txx9/generic/dbgio.c (renamed from arch/mips/tx4938/common/dbgio.c)0
-rw-r--r--arch/mips/txx9/generic/irq_tx4927.c (renamed from arch/mips/tx4927/common/tx4927_irq.c)3
-rw-r--r--arch/mips/txx9/generic/irq_tx4938.c (renamed from arch/mips/tx4938/common/irq.c)2
-rw-r--r--arch/mips/txx9/generic/mem_tx4927.c (renamed from arch/mips/tx4927/common/tx4927_prom.c)1
-rw-r--r--arch/mips/txx9/generic/mem_tx4938.c (renamed from arch/mips/tx4938/common/prom.c)0
-rw-r--r--arch/mips/txx9/generic/smsc_fdc37m81x.c (renamed from arch/mips/tx4927/common/smsc_fdc37m81x.c)2
-rw-r--r--arch/mips/txx9/jmr3927/Makefile (renamed from arch/mips/jmr3927/rbhma3100/Makefile)4
-rw-r--r--arch/mips/txx9/jmr3927/init.c (renamed from arch/mips/jmr3927/rbhma3100/init.c)2
-rw-r--r--arch/mips/txx9/jmr3927/irq.c (renamed from arch/mips/jmr3927/rbhma3100/irq.c)2
-rw-r--r--arch/mips/txx9/jmr3927/kgdb_io.c (renamed from arch/mips/jmr3927/rbhma3100/kgdb_io.c)2
-rw-r--r--arch/mips/txx9/jmr3927/prom.c (renamed from arch/mips/jmr3927/common/prom.c)26
-rw-r--r--arch/mips/txx9/jmr3927/setup.c (renamed from arch/mips/jmr3927/rbhma3100/setup.c)2
-rw-r--r--arch/mips/txx9/rbtx4927/Makefile3
-rw-r--r--arch/mips/txx9/rbtx4927/irq.c (renamed from arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c)4
-rw-r--r--arch/mips/txx9/rbtx4927/prom.c (renamed from arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c)2
-rw-r--r--arch/mips/txx9/rbtx4927/setup.c (renamed from arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c)4
-rw-r--r--arch/mips/txx9/rbtx4938/Makefile (renamed from arch/mips/tx4938/toshiba_rbtx4938/Makefile)4
-rw-r--r--arch/mips/txx9/rbtx4938/irq.c (renamed from arch/mips/tx4938/toshiba_rbtx4938/irq.c)4
-rw-r--r--arch/mips/txx9/rbtx4938/prom.c (renamed from arch/mips/tx4938/toshiba_rbtx4938/prom.c)4
-rw-r--r--arch/mips/txx9/rbtx4938/setup.c (renamed from arch/mips/tx4938/toshiba_rbtx4938/setup.c)6
-rw-r--r--arch/mips/txx9/rbtx4938/spi_eeprom.c (renamed from arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c)4
40 files changed, 77 insertions, 185 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index a0381427ec5c..3202960f7597 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -642,8 +642,7 @@ source "arch/mips/lasat/Kconfig"
642source "arch/mips/pmc-sierra/Kconfig" 642source "arch/mips/pmc-sierra/Kconfig"
643source "arch/mips/sgi-ip27/Kconfig" 643source "arch/mips/sgi-ip27/Kconfig"
644source "arch/mips/sibyte/Kconfig" 644source "arch/mips/sibyte/Kconfig"
645source "arch/mips/tx4927/Kconfig" 645source "arch/mips/txx9/Kconfig"
646source "arch/mips/tx4938/Kconfig"
647source "arch/mips/vr41xx/Kconfig" 646source "arch/mips/vr41xx/Kconfig"
648 647
649endmenu 648endmenu
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 36aa690484c8..8e1e49c5186b 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -553,8 +553,8 @@ all-$(CONFIG_SNI_RM) := vmlinux.ecoff
553# 553#
554# Toshiba JMR-TX3927 board 554# Toshiba JMR-TX3927 board
555# 555#
556core-$(CONFIG_TOSHIBA_JMR3927) += arch/mips/jmr3927/rbhma3100/ \ 556core-$(CONFIG_TOSHIBA_JMR3927) += arch/mips/txx9/jmr3927/ \
557 arch/mips/jmr3927/common/ 557 arch/mips/txx9/generic/
558cflags-$(CONFIG_TOSHIBA_JMR3927) += -Iinclude/asm-mips/mach-jmr3927 558cflags-$(CONFIG_TOSHIBA_JMR3927) += -Iinclude/asm-mips/mach-jmr3927
559load-$(CONFIG_TOSHIBA_JMR3927) += 0xffffffff80050000 559load-$(CONFIG_TOSHIBA_JMR3927) += 0xffffffff80050000
560 560
@@ -562,16 +562,16 @@ load-$(CONFIG_TOSHIBA_JMR3927) += 0xffffffff80050000
562# Toshiba RBTX4927 board or 562# Toshiba RBTX4927 board or
563# Toshiba RBTX4937 board 563# Toshiba RBTX4937 board
564# 564#
565core-$(CONFIG_TOSHIBA_RBTX4927) += arch/mips/tx4927/toshiba_rbtx4927/ 565core-$(CONFIG_TOSHIBA_RBTX4927) += arch/mips/txx9/rbtx4927/
566core-$(CONFIG_TOSHIBA_RBTX4927) += arch/mips/tx4927/common/ 566core-$(CONFIG_TOSHIBA_RBTX4927) += arch/mips/txx9/generic/
567cflags-$(CONFIG_TOSHIBA_RBTX4927) += -Iinclude/asm-mips/mach-tx49xx 567cflags-$(CONFIG_TOSHIBA_RBTX4927) += -Iinclude/asm-mips/mach-tx49xx
568load-$(CONFIG_TOSHIBA_RBTX4927) += 0xffffffff80020000 568load-$(CONFIG_TOSHIBA_RBTX4927) += 0xffffffff80020000
569 569
570# 570#
571# Toshiba RBTX4938 board 571# Toshiba RBTX4938 board
572# 572#
573core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/toshiba_rbtx4938/ 573core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/txx9/rbtx4938/
574core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/common/ 574core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/txx9/generic/
575cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx 575cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
576load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000 576load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
577 577
diff --git a/arch/mips/jmr3927/common/Makefile b/arch/mips/jmr3927/common/Makefile
deleted file mode 100644
index 8fd4fcccf10e..000000000000
--- a/arch/mips/jmr3927/common/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
1#
2# Makefile for the common code of TOSHIBA JMR-TX3927 board
3#
4
5obj-y += prom.o puts.o
6
7EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/jmr3927/common/puts.c b/arch/mips/jmr3927/common/puts.c
deleted file mode 100644
index c611ab497888..000000000000
--- a/arch/mips/jmr3927/common/puts.c
+++ /dev/null
@@ -1,60 +0,0 @@
1/*
2 *
3 * BRIEF MODULE DESCRIPTION
4 * Low level uart routines to directly access a TX[34]927 SIO.
5 *
6 * Copyright 2001 MontaVista Software Inc.
7 * Author: MontaVista Software, Inc.
8 * ahennessy@mvista.com or source@mvista.com
9 *
10 * Copyright (C) 2000-2001 Toshiba Corporation
11 *
12 * Based on arch/mips/au1000/common/puts.c
13 *
14 * This program is free software; you can redistribute it and/or modify it
15 * under the terms of the GNU General Public License as published by the
16 * Free Software Foundation; either version 2 of the License, or (at your
17 * option) any later version.
18 *
19 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
20 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
21 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
22 * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
23 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
24 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
25 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
26 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 *
30 * You should have received a copy of the GNU General Public License along
31 * with this program; if not, write to the Free Software Foundation, Inc.,
32 * 675 Mass Ave, Cambridge, MA 02139, USA.
33 */
34
35#include <asm/jmr3927/tx3927.h>
36
37#define TIMEOUT 0xffffff
38
39void
40prom_putchar(char c)
41{
42 int i = 0;
43
44 do {
45 i++;
46 if (i>TIMEOUT)
47 break;
48 } while (!(tx3927_sioptr(1)->cisr & TXx927_SICISR_TXALS));
49 tx3927_sioptr(1)->tfifo = c;
50 return;
51}
52
53void
54puts(const char *cp)
55{
56 while (*cp)
57 prom_putchar(*cp++);
58 prom_putchar('\r');
59 prom_putchar('\n');
60}
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index 80fa5abb25d4..4608e43de28c 100644
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
@@ -43,7 +43,7 @@ obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o
43obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o 43obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o
44obj-$(CONFIG_TOSHIBA_JMR3927) += fixup-jmr3927.o pci-jmr3927.o 44obj-$(CONFIG_TOSHIBA_JMR3927) += fixup-jmr3927.o pci-jmr3927.o
45obj-$(CONFIG_TOSHIBA_RBTX4927) += fixup-rbtx4927.o ops-tx4927.o 45obj-$(CONFIG_TOSHIBA_RBTX4927) += fixup-rbtx4927.o ops-tx4927.o
46obj-$(CONFIG_TOSHIBA_RBTX4938) += fixup-tx4938.o ops-tx4938.o 46obj-$(CONFIG_TOSHIBA_RBTX4938) += fixup-rbtx4938.o ops-tx4938.o
47obj-$(CONFIG_VICTOR_MPC30X) += fixup-mpc30x.o 47obj-$(CONFIG_VICTOR_MPC30X) += fixup-mpc30x.o
48obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o 48obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o
49obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o 49obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o
diff --git a/arch/mips/pci/fixup-jmr3927.c b/arch/mips/pci/fixup-jmr3927.c
index e974394be7bc..41dcd6a3aae5 100644
--- a/arch/mips/pci/fixup-jmr3927.c
+++ b/arch/mips/pci/fixup-jmr3927.c
@@ -31,7 +31,7 @@
31#include <linux/pci.h> 31#include <linux/pci.h>
32#include <linux/init.h> 32#include <linux/init.h>
33 33
34#include <asm/jmr3927/jmr3927.h> 34#include <asm/txx9/jmr3927.h>
35 35
36int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 36int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
37{ 37{
diff --git a/arch/mips/pci/fixup-rbtx4927.c b/arch/mips/pci/fixup-rbtx4927.c
index 2d234ca017db..26013badfe1f 100644
--- a/arch/mips/pci/fixup-rbtx4927.c
+++ b/arch/mips/pci/fixup-rbtx4927.c
@@ -37,7 +37,7 @@
37#include <linux/kernel.h> 37#include <linux/kernel.h>
38#include <linux/init.h> 38#include <linux/init.h>
39 39
40#include <asm/tx4927/tx4927.h> 40#include <asm/txx9/tx4927.h>
41 41
42#undef DEBUG 42#undef DEBUG
43#ifdef DEBUG 43#ifdef DEBUG
diff --git a/arch/mips/pci/fixup-tx4938.c b/arch/mips/pci/fixup-rbtx4938.c
index f2ba06ee0c10..64d4510c0265 100644
--- a/arch/mips/pci/fixup-tx4938.c
+++ b/arch/mips/pci/fixup-rbtx4938.c
@@ -14,7 +14,7 @@
14#include <linux/kernel.h> 14#include <linux/kernel.h>
15#include <linux/init.h> 15#include <linux/init.h>
16 16
17#include <asm/tx4938/rbtx4938.h> 17#include <asm/txx9/rbtx4938.h>
18 18
19extern struct pci_controller tx4938_pci_controller[]; 19extern struct pci_controller tx4938_pci_controller[];
20 20
diff --git a/arch/mips/pci/ops-tx3927.c b/arch/mips/pci/ops-tx3927.c
index aa698bd0d5e3..5d398f694682 100644
--- a/arch/mips/pci/ops-tx3927.c
+++ b/arch/mips/pci/ops-tx3927.c
@@ -39,7 +39,7 @@
39#include <linux/init.h> 39#include <linux/init.h>
40 40
41#include <asm/addrspace.h> 41#include <asm/addrspace.h>
42#include <asm/jmr3927/jmr3927.h> 42#include <asm/txx9/jmr3927.h>
43 43
44static inline int mkaddr(unsigned char bus, unsigned char dev_fn, 44static inline int mkaddr(unsigned char bus, unsigned char dev_fn,
45 unsigned char where) 45 unsigned char where)
diff --git a/arch/mips/pci/ops-tx4927.c b/arch/mips/pci/ops-tx4927.c
index 1bbafeb4a774..54730eee451b 100644
--- a/arch/mips/pci/ops-tx4927.c
+++ b/arch/mips/pci/ops-tx4927.c
@@ -40,7 +40,7 @@
40#include <linux/pci.h> 40#include <linux/pci.h>
41#include <linux/kernel.h> 41#include <linux/kernel.h>
42#include <linux/init.h> 42#include <linux/init.h>
43#include <asm/tx4927/tx4927.h> 43#include <asm/txx9/tx4927.h>
44 44
45/* initialize in setup */ 45/* initialize in setup */
46struct resource pci_io_resource = { 46struct resource pci_io_resource = {
diff --git a/arch/mips/pci/ops-tx4938.c b/arch/mips/pci/ops-tx4938.c
index a450c4062031..34494b82cb22 100644
--- a/arch/mips/pci/ops-tx4938.c
+++ b/arch/mips/pci/ops-tx4938.c
@@ -15,7 +15,7 @@
15#include <linux/init.h> 15#include <linux/init.h>
16 16
17#include <asm/addrspace.h> 17#include <asm/addrspace.h>
18#include <asm/tx4938/rbtx4938.h> 18#include <asm/txx9/rbtx4938.h>
19 19
20/* initialize in setup */ 20/* initialize in setup */
21struct resource pci_io_resource = { 21struct resource pci_io_resource = {
diff --git a/arch/mips/pci/pci-jmr3927.c b/arch/mips/pci/pci-jmr3927.c
index cb84f4e8ccae..7fb6bd71901a 100644
--- a/arch/mips/pci/pci-jmr3927.c
+++ b/arch/mips/pci/pci-jmr3927.c
@@ -31,7 +31,7 @@
31#include <linux/kernel.h> 31#include <linux/kernel.h>
32#include <linux/init.h> 32#include <linux/init.h>
33 33
34#include <asm/jmr3927/jmr3927.h> 34#include <asm/txx9/jmr3927.h>
35#include <asm/debug.h> 35#include <asm/debug.h>
36 36
37struct resource pci_io_resource = { 37struct resource pci_io_resource = {
diff --git a/arch/mips/tx4927/Kconfig b/arch/mips/tx4927/Kconfig
deleted file mode 100644
index 5fbbe12e0fc1..000000000000
--- a/arch/mips/tx4927/Kconfig
+++ /dev/null
@@ -1,3 +0,0 @@
1config TOSHIBA_FPCIB0
2 bool "FPCIB0 Backplane Support"
3 depends on TOSHIBA_RBTX4927
diff --git a/arch/mips/tx4927/common/Makefile b/arch/mips/tx4927/common/Makefile
deleted file mode 100644
index a7fe76a64964..000000000000
--- a/arch/mips/tx4927/common/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
1#
2# Makefile for common code for Toshiba TX4927 based systems
3#
4
5obj-y += tx4927_prom.o tx4927_irq.o
6
7obj-$(CONFIG_TOSHIBA_FPCIB0) += smsc_fdc37m81x.o
8obj-$(CONFIG_KGDB) += tx4927_dbgio.o
9
10EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/tx4927/common/tx4927_dbgio.c b/arch/mips/tx4927/common/tx4927_dbgio.c
deleted file mode 100644
index ea1ff23f4b72..000000000000
--- a/arch/mips/tx4927/common/tx4927_dbgio.c
+++ /dev/null
@@ -1,43 +0,0 @@
1/*
2 * linux/arch/mips/tx4927/common/tx4927_dbgio.c
3 *
4 * kgdb interface for gdb
5 *
6 * Author: MontaVista Software, Inc.
7 * source@mvista.com
8 *
9 * Copyright 2001-2002 MontaVista Software Inc.
10 *
11 * This program is free software; you can redistribute it and/or modify it
12 * under the terms of the GNU General Public License as published by the
13 * Free Software Foundation; either version 2 of the License, or (at your
14 * option) any later version.
15 *
16 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
21 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
22 * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
24 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
25 * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 *
27 * You should have received a copy of the GNU General Public License along
28 * with this program; if not, write to the Free Software Foundation, Inc.,
29 * 675 Mass Ave, Cambridge, MA 02139, USA.
30 */
31#include <linux/types.h>
32
33u8 getDebugChar(void)
34{
35 extern u8 txx9_sio_kdbg_rd(void);
36 return (txx9_sio_kdbg_rd());
37}
38
39int putDebugChar(u8 byte)
40{
41 extern int txx9_sio_kdbg_wr( u8 ch );
42 return (txx9_sio_kdbg_wr(byte));
43}
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/Makefile b/arch/mips/tx4927/toshiba_rbtx4927/Makefile
deleted file mode 100644
index 13f96725d772..000000000000
--- a/arch/mips/tx4927/toshiba_rbtx4927/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
1obj-y += toshiba_rbtx4927_prom.o
2obj-y += toshiba_rbtx4927_setup.o
3obj-y += toshiba_rbtx4927_irq.o
4
5EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/tx4938/common/Makefile b/arch/mips/tx4938/common/Makefile
deleted file mode 100644
index 56aa1ed1ee0c..000000000000
--- a/arch/mips/tx4938/common/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
1#
2# Makefile for common code for Toshiba TX4927 based systems
3#
4
5obj-y += prom.o irq.o
6obj-$(CONFIG_KGDB) += dbgio.o
7
8EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/tx4938/Kconfig b/arch/mips/txx9/Kconfig
index d90e9cd85138..98d103402b10 100644
--- a/arch/mips/tx4938/Kconfig
+++ b/arch/mips/txx9/Kconfig
@@ -1,3 +1,7 @@
1config TOSHIBA_FPCIB0
2 bool "FPCIB0 Backplane Support"
3 depends on TOSHIBA_RBTX4927
4
1if TOSHIBA_RBTX4938 5if TOSHIBA_RBTX4938
2 6
3comment "Multiplex Pin Select" 7comment "Multiplex Pin Select"
diff --git a/arch/mips/txx9/generic/Makefile b/arch/mips/txx9/generic/Makefile
new file mode 100644
index 000000000000..8cb4a7e81473
--- /dev/null
+++ b/arch/mips/txx9/generic/Makefile
@@ -0,0 +1,10 @@
1#
2# Makefile for common code for TXx9 based systems
3#
4
5obj-$(CONFIG_TOSHIBA_RBTX4927) += mem_tx4927.o irq_tx4927.o
6obj-$(CONFIG_TOSHIBA_RBTX4938) += mem_tx4938.o irq_tx4938.o
7obj-$(CONFIG_TOSHIBA_FPCIB0) += smsc_fdc37m81x.o
8obj-$(CONFIG_KGDB) += dbgio.o
9
10EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/tx4938/common/dbgio.c b/arch/mips/txx9/generic/dbgio.c
index 33b9c672a322..33b9c672a322 100644
--- a/arch/mips/tx4938/common/dbgio.c
+++ b/arch/mips/txx9/generic/dbgio.c
diff --git a/arch/mips/tx4927/common/tx4927_irq.c b/arch/mips/txx9/generic/irq_tx4927.c
index 0aabd57fdad2..685ecc2ed551 100644
--- a/arch/mips/tx4927/common/tx4927_irq.c
+++ b/arch/mips/txx9/generic/irq_tx4927.c
@@ -27,9 +27,8 @@
27#include <linux/interrupt.h> 27#include <linux/interrupt.h>
28#include <asm/irq_cpu.h> 28#include <asm/irq_cpu.h>
29#include <asm/mipsregs.h> 29#include <asm/mipsregs.h>
30#include <asm/tx4927/tx4927.h>
31#ifdef CONFIG_TOSHIBA_RBTX4927 30#ifdef CONFIG_TOSHIBA_RBTX4927
32#include <asm/tx4927/toshiba_rbtx4927.h> 31#include <asm/txx9/rbtx4927.h>
33#endif 32#endif
34 33
35void __init tx4927_irq_init(void) 34void __init tx4927_irq_init(void)
diff --git a/arch/mips/tx4938/common/irq.c b/arch/mips/txx9/generic/irq_tx4938.c
index c059b899d120..0886d9138818 100644
--- a/arch/mips/tx4938/common/irq.c
+++ b/arch/mips/txx9/generic/irq_tx4938.c
@@ -15,7 +15,7 @@
15#include <linux/interrupt.h> 15#include <linux/interrupt.h>
16#include <asm/irq_cpu.h> 16#include <asm/irq_cpu.h>
17#include <asm/mipsregs.h> 17#include <asm/mipsregs.h>
18#include <asm/tx4938/rbtx4938.h> 18#include <asm/txx9/rbtx4938.h>
19 19
20void __init 20void __init
21tx4938_irq_init(void) 21tx4938_irq_init(void)
diff --git a/arch/mips/tx4927/common/tx4927_prom.c b/arch/mips/txx9/generic/mem_tx4927.c
index cc2aa9d63e82..12dfc377bf2f 100644
--- a/arch/mips/tx4927/common/tx4927_prom.c
+++ b/arch/mips/txx9/generic/mem_tx4927.c
@@ -32,7 +32,6 @@
32#include <linux/init.h> 32#include <linux/init.h>
33#include <linux/types.h> 33#include <linux/types.h>
34#include <linux/io.h> 34#include <linux/io.h>
35#include <asm/tx4927/tx4927.h>
36 35
37static unsigned int __init tx4927_process_sdccr(unsigned long addr) 36static unsigned int __init tx4927_process_sdccr(unsigned long addr)
38{ 37{
diff --git a/arch/mips/tx4938/common/prom.c b/arch/mips/txx9/generic/mem_tx4938.c
index 20baeaeba4cd..20baeaeba4cd 100644
--- a/arch/mips/tx4938/common/prom.c
+++ b/arch/mips/txx9/generic/mem_tx4938.c
diff --git a/arch/mips/tx4927/common/smsc_fdc37m81x.c b/arch/mips/txx9/generic/smsc_fdc37m81x.c
index 33f517bc9a08..69e487467fa5 100644
--- a/arch/mips/tx4927/common/smsc_fdc37m81x.c
+++ b/arch/mips/txx9/generic/smsc_fdc37m81x.c
@@ -13,7 +13,7 @@
13#include <linux/init.h> 13#include <linux/init.h>
14#include <linux/types.h> 14#include <linux/types.h>
15#include <asm/io.h> 15#include <asm/io.h>
16#include <asm/tx4927/smsc_fdc37m81x.h> 16#include <asm/txx9/smsc_fdc37m81x.h>
17 17
18#define DEBUG 18#define DEBUG
19 19
diff --git a/arch/mips/jmr3927/rbhma3100/Makefile b/arch/mips/txx9/jmr3927/Makefile
index d86e30dca8f3..5f83ea375225 100644
--- a/arch/mips/jmr3927/rbhma3100/Makefile
+++ b/arch/mips/txx9/jmr3927/Makefile
@@ -2,7 +2,7 @@
2# Makefile for TOSHIBA JMR-TX3927 board 2# Makefile for TOSHIBA JMR-TX3927 board
3# 3#
4 4
5obj-y += init.o irq.o setup.o 5obj-y += prom.o init.o irq.o setup.o
6obj-$(CONFIG_KGDB) += kgdb_io.o 6obj-$(CONFIG_KGDB) += kgdb_io.o
7 7
8EXTRA_CFLAGS += -Werror 8EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/jmr3927/rbhma3100/init.c b/arch/mips/txx9/jmr3927/init.c
index 700b9cf8eb9d..1bbb5343baf4 100644
--- a/arch/mips/jmr3927/rbhma3100/init.c
+++ b/arch/mips/txx9/jmr3927/init.c
@@ -29,7 +29,7 @@
29 */ 29 */
30#include <linux/init.h> 30#include <linux/init.h>
31#include <asm/bootinfo.h> 31#include <asm/bootinfo.h>
32#include <asm/jmr3927/jmr3927.h> 32#include <asm/txx9/jmr3927.h>
33 33
34extern void __init prom_init_cmdline(void); 34extern void __init prom_init_cmdline(void);
35 35
diff --git a/arch/mips/jmr3927/rbhma3100/irq.c b/arch/mips/txx9/jmr3927/irq.c
index 3a47e8ce1196..85e1daf15c7b 100644
--- a/arch/mips/jmr3927/rbhma3100/irq.c
+++ b/arch/mips/txx9/jmr3927/irq.c
@@ -39,7 +39,7 @@
39#include <asm/system.h> 39#include <asm/system.h>
40 40
41#include <asm/processor.h> 41#include <asm/processor.h>
42#include <asm/jmr3927/jmr3927.h> 42#include <asm/txx9/jmr3927.h>
43 43
44#if JMR3927_IRQ_END > NR_IRQS 44#if JMR3927_IRQ_END > NR_IRQS
45#error JMR3927_IRQ_END > NR_IRQS 45#error JMR3927_IRQ_END > NR_IRQS
diff --git a/arch/mips/jmr3927/rbhma3100/kgdb_io.c b/arch/mips/txx9/jmr3927/kgdb_io.c
index 342579cfdc01..5bd757e56f79 100644
--- a/arch/mips/jmr3927/rbhma3100/kgdb_io.c
+++ b/arch/mips/txx9/jmr3927/kgdb_io.c
@@ -31,7 +31,7 @@
31 * 675 Mass Ave, Cambridge, MA 02139, USA. 31 * 675 Mass Ave, Cambridge, MA 02139, USA.
32 */ 32 */
33 33
34#include <asm/jmr3927/jmr3927.h> 34#include <asm/txx9/jmr3927.h>
35 35
36#define TIMEOUT 0xffffff 36#define TIMEOUT 0xffffff
37 37
diff --git a/arch/mips/jmr3927/common/prom.c b/arch/mips/txx9/jmr3927/prom.c
index 5398813e50e6..8bc1049b622e 100644
--- a/arch/mips/jmr3927/common/prom.c
+++ b/arch/mips/txx9/jmr3927/prom.c
@@ -40,6 +40,7 @@
40#include <linux/string.h> 40#include <linux/string.h>
41 41
42#include <asm/bootinfo.h> 42#include <asm/bootinfo.h>
43#include <asm/txx9/tx3927.h>
43 44
44char * __init prom_getcmdline(void) 45char * __init prom_getcmdline(void)
45{ 46{
@@ -70,3 +71,28 @@ void __init prom_init_cmdline(void)
70void __init prom_free_prom_memory(void) 71void __init prom_free_prom_memory(void)
71{ 72{
72} 73}
74
75#define TIMEOUT 0xffffff
76
77void
78prom_putchar(char c)
79{
80 int i = 0;
81
82 do {
83 i++;
84 if (i>TIMEOUT)
85 break;
86 } while (!(tx3927_sioptr(1)->cisr & TXx927_SICISR_TXALS));
87 tx3927_sioptr(1)->tfifo = c;
88 return;
89}
90
91void
92puts(const char *cp)
93{
94 while (*cp)
95 prom_putchar(*cp++);
96 prom_putchar('\r');
97 prom_putchar('\n');
98}
diff --git a/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/txx9/jmr3927/setup.c
index f39c444e42d4..41e0f3b3af2c 100644
--- a/arch/mips/jmr3927/rbhma3100/setup.c
+++ b/arch/mips/txx9/jmr3927/setup.c
@@ -44,7 +44,7 @@
44#include <asm/txx9tmr.h> 44#include <asm/txx9tmr.h>
45#include <asm/txx9pio.h> 45#include <asm/txx9pio.h>
46#include <asm/reboot.h> 46#include <asm/reboot.h>
47#include <asm/jmr3927/jmr3927.h> 47#include <asm/txx9/jmr3927.h>
48#include <asm/mipsregs.h> 48#include <asm/mipsregs.h>
49 49
50extern void puts(const char *cp); 50extern void puts(const char *cp);
diff --git a/arch/mips/txx9/rbtx4927/Makefile b/arch/mips/txx9/rbtx4927/Makefile
new file mode 100644
index 000000000000..f3e1f597b4f1
--- /dev/null
+++ b/arch/mips/txx9/rbtx4927/Makefile
@@ -0,0 +1,3 @@
1obj-y += prom.o setup.o irq.o
2
3EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c b/arch/mips/txx9/rbtx4927/irq.c
index c18901a75cc4..936e50e91d95 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
+++ b/arch/mips/txx9/rbtx4927/irq.c
@@ -1,6 +1,4 @@
1/* 1/*
2 * linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
3 *
4 * Toshiba RBTX4927 specific interrupt handlers 2 * Toshiba RBTX4927 specific interrupt handlers
5 * 3 *
6 * Author: MontaVista Software, Inc. 4 * Author: MontaVista Software, Inc.
@@ -116,7 +114,7 @@ JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB
116#ifdef CONFIG_TOSHIBA_FPCIB0 114#ifdef CONFIG_TOSHIBA_FPCIB0
117#include <asm/i8259.h> 115#include <asm/i8259.h>
118#endif 116#endif
119#include <asm/tx4927/toshiba_rbtx4927.h> 117#include <asm/txx9/rbtx4927.h>
120 118
121#define TOSHIBA_RBTX4927_IRQ_IOC_RAW_BEG 0 119#define TOSHIBA_RBTX4927_IRQ_IOC_RAW_BEG 0
122#define TOSHIBA_RBTX4927_IRQ_IOC_RAW_END 7 120#define TOSHIBA_RBTX4927_IRQ_IOC_RAW_END 7
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c b/arch/mips/txx9/rbtx4927/prom.c
index fdbad4bc6021..0020bbee838b 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
+++ b/arch/mips/txx9/rbtx4927/prom.c
@@ -34,7 +34,7 @@
34#include <asm/bootinfo.h> 34#include <asm/bootinfo.h>
35#include <asm/cpu.h> 35#include <asm/cpu.h>
36#include <asm/mipsregs.h> 36#include <asm/mipsregs.h>
37#include <asm/tx4927/tx4927.h> 37#include <asm/txx9/tx4927.h>
38 38
39void __init prom_init_cmdline(void) 39void __init prom_init_cmdline(void)
40{ 40{
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/txx9/rbtx4927/setup.c
index 185f303c0e2a..df1b6e99b666 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
+++ b/arch/mips/txx9/rbtx4927/setup.c
@@ -59,9 +59,9 @@
59#include <asm/time.h> 59#include <asm/time.h>
60#include <asm/txx9tmr.h> 60#include <asm/txx9tmr.h>
61#ifdef CONFIG_TOSHIBA_FPCIB0 61#ifdef CONFIG_TOSHIBA_FPCIB0
62#include <asm/tx4927/smsc_fdc37m81x.h> 62#include <asm/txx9/smsc_fdc37m81x.h>
63#endif 63#endif
64#include <asm/tx4927/toshiba_rbtx4927.h> 64#include <asm/txx9/rbtx4927.h>
65#ifdef CONFIG_SERIAL_TXX9 65#ifdef CONFIG_SERIAL_TXX9
66#include <linux/serial_core.h> 66#include <linux/serial_core.h>
67#endif 67#endif
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/Makefile b/arch/mips/txx9/rbtx4938/Makefile
index 2316dd7dd1bd..9dcc52ae5b9d 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/Makefile
+++ b/arch/mips/txx9/rbtx4938/Makefile
@@ -1,7 +1,3 @@
1#
2# Makefile for common code for Toshiba TX4927 based systems
3#
4
5obj-y += prom.o setup.o irq.o spi_eeprom.o 1obj-y += prom.o setup.o irq.o spi_eeprom.o
6 2
7EXTRA_CFLAGS += -Werror 3EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/irq.c b/arch/mips/txx9/rbtx4938/irq.c
index 4d6a8dc46c76..f4984820251a 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/irq.c
+++ b/arch/mips/txx9/rbtx4938/irq.c
@@ -1,6 +1,4 @@
1/* 1/*
2 * linux/arch/mips/tx4938/toshiba_rbtx4938/irq.c
3 *
4 * Toshiba RBTX4938 specific interrupt handlers 2 * Toshiba RBTX4938 specific interrupt handlers
5 * Copyright (C) 2000-2001 Toshiba Corporation 3 * Copyright (C) 2000-2001 Toshiba Corporation
6 * 4 *
@@ -68,7 +66,7 @@ IRQ Device
68*/ 66*/
69#include <linux/init.h> 67#include <linux/init.h>
70#include <linux/interrupt.h> 68#include <linux/interrupt.h>
71#include <asm/tx4938/rbtx4938.h> 69#include <asm/txx9/rbtx4938.h>
72 70
73static void toshiba_rbtx4938_irq_ioc_enable(unsigned int irq); 71static void toshiba_rbtx4938_irq_ioc_enable(unsigned int irq);
74static void toshiba_rbtx4938_irq_ioc_disable(unsigned int irq); 72static void toshiba_rbtx4938_irq_ioc_disable(unsigned int irq);
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/prom.c b/arch/mips/txx9/rbtx4938/prom.c
index 1644bffa501a..134fcc2dc7d2 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/prom.c
+++ b/arch/mips/txx9/rbtx4938/prom.c
@@ -1,6 +1,4 @@
1/* 1/*
2 * linux/arch/mips/tx4938/toshiba_rbtx4938/prom.c
3 *
4 * rbtx4938 specific prom routines 2 * rbtx4938 specific prom routines
5 * Copyright (C) 2000-2001 Toshiba Corporation 3 * Copyright (C) 2000-2001 Toshiba Corporation
6 * 4 *
@@ -19,7 +17,7 @@
19 17
20#include <asm/addrspace.h> 18#include <asm/addrspace.h>
21#include <asm/bootinfo.h> 19#include <asm/bootinfo.h>
22#include <asm/tx4938/tx4938.h> 20#include <asm/txx9/tx4938.h>
23 21
24void __init prom_init_cmdline(void) 22void __init prom_init_cmdline(void)
25{ 23{
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/setup.c b/arch/mips/txx9/rbtx4938/setup.c
index 3a3659e8633a..bbd572c9675b 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/setup.c
+++ b/arch/mips/txx9/rbtx4938/setup.c
@@ -1,6 +1,4 @@
1/* 1/*
2 * linux/arch/mips/tx4938/toshiba_rbtx4938/setup.c
3 *
4 * Setup pointers to hardware-dependent routines. 2 * Setup pointers to hardware-dependent routines.
5 * Copyright (C) 2000-2001 Toshiba Corporation 3 * Copyright (C) 2000-2001 Toshiba Corporation
6 * 4 *
@@ -28,12 +26,12 @@
28#include <asm/txx9tmr.h> 26#include <asm/txx9tmr.h>
29#include <asm/io.h> 27#include <asm/io.h>
30#include <asm/bootinfo.h> 28#include <asm/bootinfo.h>
31#include <asm/tx4938/rbtx4938.h> 29#include <asm/txx9/rbtx4938.h>
32#ifdef CONFIG_SERIAL_TXX9 30#ifdef CONFIG_SERIAL_TXX9
33#include <linux/serial_core.h> 31#include <linux/serial_core.h>
34#endif 32#endif
35#include <linux/spi/spi.h> 33#include <linux/spi/spi.h>
36#include <asm/tx4938/spi.h> 34#include <asm/txx9/spi.h>
37#include <asm/txx9pio.h> 35#include <asm/txx9pio.h>
38 36
39extern char * __init prom_getcmdline(void); 37extern char * __init prom_getcmdline(void);
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c b/arch/mips/txx9/rbtx4938/spi_eeprom.c
index 4d6b4ade5e8c..a7ea8b041c1d 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c
+++ b/arch/mips/txx9/rbtx4938/spi_eeprom.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c 2 * spi_eeprom.c
3 * Copyright (C) 2000-2001 Toshiba Corporation 3 * Copyright (C) 2000-2001 Toshiba Corporation
4 * 4 *
5 * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the 5 * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the
@@ -13,7 +13,7 @@
13#include <linux/device.h> 13#include <linux/device.h>
14#include <linux/spi/spi.h> 14#include <linux/spi/spi.h>
15#include <linux/spi/eeprom.h> 15#include <linux/spi/eeprom.h>
16#include <asm/tx4938/spi.h> 16#include <asm/txx9/spi.h>
17 17
18#define AT250X0_PAGE_SIZE 8 18#define AT250X0_PAGE_SIZE 8
19 19
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-02 17:43:03 -0500