From 22b1d707ffc99faebd86257ad19d5bb9fc624734 Mon Sep 17 00:00:00 2001 From: Atsushi Nemoto Date: Fri, 11 Jul 2008 00:31:36 +0900 Subject: [PATCH] [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 Signed-off-by: Ralf Baechle --- arch/mips/Kconfig | 3 +- arch/mips/Makefile | 12 ++-- arch/mips/jmr3927/common/Makefile | 7 --- arch/mips/jmr3927/common/puts.c | 60 ------------------- arch/mips/pci/Makefile | 2 +- arch/mips/pci/fixup-jmr3927.c | 2 +- arch/mips/pci/fixup-rbtx4927.c | 2 +- .../pci/{fixup-tx4938.c => fixup-rbtx4938.c} | 2 +- arch/mips/pci/ops-tx3927.c | 2 +- arch/mips/pci/ops-tx4927.c | 2 +- arch/mips/pci/ops-tx4938.c | 2 +- arch/mips/pci/pci-jmr3927.c | 2 +- arch/mips/tx4927/Kconfig | 3 - arch/mips/tx4927/common/Makefile | 10 ---- arch/mips/tx4927/common/tx4927_dbgio.c | 43 ------------- arch/mips/tx4927/toshiba_rbtx4927/Makefile | 5 -- arch/mips/tx4938/common/Makefile | 8 --- arch/mips/{tx4938 => txx9}/Kconfig | 4 ++ arch/mips/txx9/generic/Makefile | 10 ++++ .../{tx4938/common => txx9/generic}/dbgio.c | 0 .../generic/irq_tx4927.c} | 3 +- .../irq.c => txx9/generic/irq_tx4938.c} | 2 +- .../generic/mem_tx4927.c} | 1 - .../prom.c => txx9/generic/mem_tx4938.c} | 0 .../common => txx9/generic}/smsc_fdc37m81x.c | 2 +- .../rbhma3100 => txx9/jmr3927}/Makefile | 4 +- .../rbhma3100 => txx9/jmr3927}/init.c | 2 +- .../{jmr3927/rbhma3100 => txx9/jmr3927}/irq.c | 2 +- .../rbhma3100 => txx9/jmr3927}/kgdb_io.c | 2 +- .../{jmr3927/common => txx9/jmr3927}/prom.c | 26 ++++++++ .../rbhma3100 => txx9/jmr3927}/setup.c | 2 +- arch/mips/txx9/rbtx4927/Makefile | 3 + .../rbtx4927/irq.c} | 4 +- .../rbtx4927/prom.c} | 2 +- .../rbtx4927/setup.c} | 4 +- .../rbtx4938}/Makefile | 4 -- .../toshiba_rbtx4938 => txx9/rbtx4938}/irq.c | 4 +- .../toshiba_rbtx4938 => txx9/rbtx4938}/prom.c | 4 +- .../rbtx4938}/setup.c | 6 +- .../rbtx4938}/spi_eeprom.c | 4 +- include/asm-mips/{jmr3927 => txx9}/jmr3927.h | 8 +-- .../toshiba_rbtx4927.h => txx9/rbtx4927.h} | 8 +-- include/asm-mips/{tx4938 => txx9}/rbtx4938.h | 9 ++- .../{tx4927 => txx9}/smsc_fdc37m81x.h | 2 - include/asm-mips/{tx4938 => txx9}/spi.h | 7 +-- include/asm-mips/{jmr3927 => txx9}/tx3927.h | 8 +-- include/asm-mips/{tx4927 => txx9}/tx4927.h | 6 +- include/asm-mips/{tx4938 => txx9}/tx4938.h | 5 +- include/asm-mips/{jmr3927 => txx9}/txx927.h | 6 +- 49 files changed, 104 insertions(+), 217 deletions(-) delete mode 100644 arch/mips/jmr3927/common/Makefile delete mode 100644 arch/mips/jmr3927/common/puts.c rename arch/mips/pci/{fixup-tx4938.c => fixup-rbtx4938.c} (98%) delete mode 100644 arch/mips/tx4927/Kconfig delete mode 100644 arch/mips/tx4927/common/Makefile delete mode 100644 arch/mips/tx4927/common/tx4927_dbgio.c delete mode 100644 arch/mips/tx4927/toshiba_rbtx4927/Makefile delete mode 100644 arch/mips/tx4938/common/Makefile rename arch/mips/{tx4938 => txx9}/Kconfig (86%) create mode 100644 arch/mips/txx9/generic/Makefile rename arch/mips/{tx4938/common => txx9/generic}/dbgio.c (100%) rename arch/mips/{tx4927/common/tx4927_irq.c => txx9/generic/irq_tx4927.c} (96%) rename arch/mips/{tx4938/common/irq.c => txx9/generic/irq_tx4938.c} (97%) rename arch/mips/{tx4927/common/tx4927_prom.c => txx9/generic/mem_tx4927.c} (99%) rename arch/mips/{tx4938/common/prom.c => txx9/generic/mem_tx4938.c} (100%) rename arch/mips/{tx4927/common => txx9/generic}/smsc_fdc37m81x.c (99%) rename arch/mips/{jmr3927/rbhma3100 => txx9/jmr3927}/Makefile (50%) rename arch/mips/{jmr3927/rbhma3100 => txx9/jmr3927}/init.c (98%) rename arch/mips/{jmr3927/rbhma3100 => txx9/jmr3927}/irq.c (99%) rename arch/mips/{jmr3927/rbhma3100 => txx9/jmr3927}/kgdb_io.c (98%) rename arch/mips/{jmr3927/common => txx9/jmr3927}/prom.c (84%) rename arch/mips/{jmr3927/rbhma3100 => txx9/jmr3927}/setup.c (99%) create mode 100644 arch/mips/txx9/rbtx4927/Makefile rename arch/mips/{tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c => txx9/rbtx4927/irq.c} (98%) rename arch/mips/{tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c => txx9/rbtx4927/prom.c} (98%) rename arch/mips/{tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c => txx9/rbtx4927/setup.c} (99%) rename arch/mips/{tx4938/toshiba_rbtx4938 => txx9/rbtx4938}/Makefile (51%) rename arch/mips/{tx4938/toshiba_rbtx4938 => txx9/rbtx4938}/irq.c (97%) rename arch/mips/{tx4938/toshiba_rbtx4938 => txx9/rbtx4938}/prom.c (94%) rename arch/mips/{tx4938/toshiba_rbtx4938 => txx9/rbtx4938}/setup.c (99%) rename arch/mips/{tx4938/toshiba_rbtx4938 => txx9/rbtx4938}/spi_eeprom.c (96%) rename include/asm-mips/{jmr3927 => txx9}/jmr3927.h (98%) rename include/asm-mips/{tx4927/toshiba_rbtx4927.h => txx9/rbtx4927.h} (92%) rename include/asm-mips/{tx4938 => txx9}/rbtx4938.h (97%) rename include/asm-mips/{tx4927 => txx9}/smsc_fdc37m81x.h (97%) rename include/asm-mips/{tx4938 => txx9}/spi.h (77%) rename include/asm-mips/{jmr3927 => txx9}/tx3927.h (98%) rename include/asm-mips/{tx4927 => txx9}/tx4927.h (99%) rename include/asm-mips/{tx4938 => txx9}/tx4938.h (99%) rename include/asm-mips/{jmr3927 => txx9}/txx927.h (97%) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index a0381427ec5..3202960f759 100644 --- a/arch/mips/Kconfig +++ b/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/arch/mips/Makefile b/arch/mips/Makefile index 36aa690484c..8e1e49c5186 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -553,8 +553,8 @@ 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 @@ -562,16 +562,16 @@ 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/arch/mips/jmr3927/common/Makefile b/arch/mips/jmr3927/common/Makefile deleted file mode 100644 index 8fd4fcccf10..00000000000 --- a/arch/mips/jmr3927/common/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# Makefile for the common code of TOSHIBA JMR-TX3927 board -# - -obj-y += prom.o puts.o - -EXTRA_CFLAGS += -Werror diff --git a/arch/mips/jmr3927/common/puts.c b/arch/mips/jmr3927/common/puts.c deleted file mode 100644 index c611ab49788..00000000000 --- a/arch/mips/jmr3927/common/puts.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * - * BRIEF MODULE DESCRIPTION - * Low level uart routines to directly access a TX[34]927 SIO. - * - * Copyright 2001 MontaVista Software Inc. - * Author: MontaVista Software, Inc. - * ahennessy@mvista.com or source@mvista.com - * - * Copyright (C) 2000-2001 Toshiba Corporation - * - * Based on arch/mips/au1000/common/puts.c - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#include - -#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/arch/mips/pci/Makefile b/arch/mips/pci/Makefile index 80fa5abb25d..4608e43de28 100644 --- a/arch/mips/pci/Makefile +++ b/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/arch/mips/pci/fixup-jmr3927.c b/arch/mips/pci/fixup-jmr3927.c index e974394be7b..41dcd6a3aae 100644 --- a/arch/mips/pci/fixup-jmr3927.c +++ b/arch/mips/pci/fixup-jmr3927.c @@ -31,7 +31,7 @@ #include #include -#include +#include int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { diff --git a/arch/mips/pci/fixup-rbtx4927.c b/arch/mips/pci/fixup-rbtx4927.c index 2d234ca017d..26013badfe1 100644 --- a/arch/mips/pci/fixup-rbtx4927.c +++ b/arch/mips/pci/fixup-rbtx4927.c @@ -37,7 +37,7 @@ #include #include -#include +#include #undef DEBUG #ifdef DEBUG diff --git a/arch/mips/pci/fixup-tx4938.c b/arch/mips/pci/fixup-rbtx4938.c similarity index 98% rename from arch/mips/pci/fixup-tx4938.c rename to arch/mips/pci/fixup-rbtx4938.c index f2ba06ee0c1..64d4510c026 100644 --- a/arch/mips/pci/fixup-tx4938.c +++ b/arch/mips/pci/fixup-rbtx4938.c @@ -14,7 +14,7 @@ #include #include -#include +#include extern struct pci_controller tx4938_pci_controller[]; diff --git a/arch/mips/pci/ops-tx3927.c b/arch/mips/pci/ops-tx3927.c index aa698bd0d5e..5d398f69468 100644 --- a/arch/mips/pci/ops-tx3927.c +++ b/arch/mips/pci/ops-tx3927.c @@ -39,7 +39,7 @@ #include #include -#include +#include static inline int mkaddr(unsigned char bus, unsigned char dev_fn, unsigned char where) diff --git a/arch/mips/pci/ops-tx4927.c b/arch/mips/pci/ops-tx4927.c index 1bbafeb4a77..54730eee451 100644 --- a/arch/mips/pci/ops-tx4927.c +++ b/arch/mips/pci/ops-tx4927.c @@ -40,7 +40,7 @@ #include #include #include -#include +#include /* initialize in setup */ struct resource pci_io_resource = { diff --git a/arch/mips/pci/ops-tx4938.c b/arch/mips/pci/ops-tx4938.c index a450c406203..34494b82cb2 100644 --- a/arch/mips/pci/ops-tx4938.c +++ b/arch/mips/pci/ops-tx4938.c @@ -15,7 +15,7 @@ #include #include -#include +#include /* initialize in setup */ struct resource pci_io_resource = { diff --git a/arch/mips/pci/pci-jmr3927.c b/arch/mips/pci/pci-jmr3927.c index cb84f4e8cca..7fb6bd71901 100644 --- a/arch/mips/pci/pci-jmr3927.c +++ b/arch/mips/pci/pci-jmr3927.c @@ -31,7 +31,7 @@ #include #include -#include +#include #include struct resource pci_io_resource = { diff --git a/arch/mips/tx4927/Kconfig b/arch/mips/tx4927/Kconfig deleted file mode 100644 index 5fbbe12e0fc..00000000000 --- a/arch/mips/tx4927/Kconfig +++ /dev/null @@ -1,3 +0,0 @@ -config TOSHIBA_FPCIB0 - bool "FPCIB0 Backplane Support" - depends on TOSHIBA_RBTX4927 diff --git a/arch/mips/tx4927/common/Makefile b/arch/mips/tx4927/common/Makefile deleted file mode 100644 index a7fe76a6496..00000000000 --- a/arch/mips/tx4927/common/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# -# Makefile for common code for Toshiba TX4927 based systems -# - -obj-y += tx4927_prom.o tx4927_irq.o - -obj-$(CONFIG_TOSHIBA_FPCIB0) += smsc_fdc37m81x.o -obj-$(CONFIG_KGDB) += tx4927_dbgio.o - -EXTRA_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 ea1ff23f4b7..00000000000 --- a/arch/mips/tx4927/common/tx4927_dbgio.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * linux/arch/mips/tx4927/common/tx4927_dbgio.c - * - * kgdb interface for gdb - * - * Author: MontaVista Software, Inc. - * source@mvista.com - * - * Copyright 2001-2002 MontaVista Software Inc. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - */ -#include - -u8 getDebugChar(void) -{ - extern u8 txx9_sio_kdbg_rd(void); - return (txx9_sio_kdbg_rd()); -} - -int putDebugChar(u8 byte) -{ - extern int txx9_sio_kdbg_wr( u8 ch ); - return (txx9_sio_kdbg_wr(byte)); -} diff --git a/arch/mips/tx4927/toshiba_rbtx4927/Makefile b/arch/mips/tx4927/toshiba_rbtx4927/Makefile deleted file mode 100644 index 13f96725d77..00000000000 --- a/arch/mips/tx4927/toshiba_rbtx4927/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -obj-y += toshiba_rbtx4927_prom.o -obj-y += toshiba_rbtx4927_setup.o -obj-y += toshiba_rbtx4927_irq.o - -EXTRA_CFLAGS += -Werror diff --git a/arch/mips/tx4938/common/Makefile b/arch/mips/tx4938/common/Makefile deleted file mode 100644 index 56aa1ed1ee0..00000000000 --- a/arch/mips/tx4938/common/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# Makefile for common code for Toshiba TX4927 based systems -# - -obj-y += prom.o irq.o -obj-$(CONFIG_KGDB) += dbgio.o - -EXTRA_CFLAGS += -Werror diff --git a/arch/mips/tx4938/Kconfig b/arch/mips/txx9/Kconfig similarity index 86% rename from arch/mips/tx4938/Kconfig rename to arch/mips/txx9/Kconfig index d90e9cd8513..98d103402b1 100644 --- a/arch/mips/tx4938/Kconfig +++ b/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/arch/mips/txx9/generic/Makefile b/arch/mips/txx9/generic/Makefile new file mode 100644 index 00000000000..8cb4a7e8147 --- /dev/null +++ b/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/arch/mips/tx4938/common/dbgio.c b/arch/mips/txx9/generic/dbgio.c similarity index 100% rename from arch/mips/tx4938/common/dbgio.c rename to arch/mips/txx9/generic/dbgio.c diff --git a/arch/mips/tx4927/common/tx4927_irq.c b/arch/mips/txx9/generic/irq_tx4927.c similarity index 96% rename from arch/mips/tx4927/common/tx4927_irq.c rename to arch/mips/txx9/generic/irq_tx4927.c index 0aabd57fdad..685ecc2ed55 100644 --- a/arch/mips/tx4927/common/tx4927_irq.c +++ b/arch/mips/txx9/generic/irq_tx4927.c @@ -27,9 +27,8 @@ #include #include #include -#include #ifdef CONFIG_TOSHIBA_RBTX4927 -#include +#include #endif void __init tx4927_irq_init(void) diff --git a/arch/mips/tx4938/common/irq.c b/arch/mips/txx9/generic/irq_tx4938.c similarity index 97% rename from arch/mips/tx4938/common/irq.c rename to arch/mips/txx9/generic/irq_tx4938.c index c059b899d12..0886d913881 100644 --- a/arch/mips/tx4938/common/irq.c +++ b/arch/mips/txx9/generic/irq_tx4938.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include void __init tx4938_irq_init(void) diff --git a/arch/mips/tx4927/common/tx4927_prom.c b/arch/mips/txx9/generic/mem_tx4927.c similarity index 99% rename from arch/mips/tx4927/common/tx4927_prom.c rename to arch/mips/txx9/generic/mem_tx4927.c index cc2aa9d63e8..12dfc377bf2 100644 --- a/arch/mips/tx4927/common/tx4927_prom.c +++ b/arch/mips/txx9/generic/mem_tx4927.c @@ -32,7 +32,6 @@ #include #include #include -#include static unsigned int __init tx4927_process_sdccr(unsigned long addr) { diff --git a/arch/mips/tx4938/common/prom.c b/arch/mips/txx9/generic/mem_tx4938.c similarity index 100% rename from arch/mips/tx4938/common/prom.c rename to 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 similarity index 99% rename from arch/mips/tx4927/common/smsc_fdc37m81x.c rename to arch/mips/txx9/generic/smsc_fdc37m81x.c index 33f517bc9a0..69e487467fa 100644 --- a/arch/mips/tx4927/common/smsc_fdc37m81x.c +++ b/arch/mips/txx9/generic/smsc_fdc37m81x.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #define DEBUG diff --git a/arch/mips/jmr3927/rbhma3100/Makefile b/arch/mips/txx9/jmr3927/Makefile similarity index 50% rename from arch/mips/jmr3927/rbhma3100/Makefile rename to arch/mips/txx9/jmr3927/Makefile index d86e30dca8f..5f83ea37522 100644 --- a/arch/mips/jmr3927/rbhma3100/Makefile +++ b/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/arch/mips/jmr3927/rbhma3100/init.c b/arch/mips/txx9/jmr3927/init.c similarity index 98% rename from arch/mips/jmr3927/rbhma3100/init.c rename to arch/mips/txx9/jmr3927/init.c index 700b9cf8eb9..1bbb5343baf 100644 --- a/arch/mips/jmr3927/rbhma3100/init.c +++ b/arch/mips/txx9/jmr3927/init.c @@ -29,7 +29,7 @@ */ #include #include -#include +#include extern void __init prom_init_cmdline(void); diff --git a/arch/mips/jmr3927/rbhma3100/irq.c b/arch/mips/txx9/jmr3927/irq.c similarity index 99% rename from arch/mips/jmr3927/rbhma3100/irq.c rename to arch/mips/txx9/jmr3927/irq.c index 3a47e8ce119..85e1daf15c7 100644 --- a/arch/mips/jmr3927/rbhma3100/irq.c +++ b/arch/mips/txx9/jmr3927/irq.c @@ -39,7 +39,7 @@ #include #include -#include +#include #if JMR3927_IRQ_END > NR_IRQS #error JMR3927_IRQ_END > NR_IRQS diff --git a/arch/mips/jmr3927/rbhma3100/kgdb_io.c b/arch/mips/txx9/jmr3927/kgdb_io.c similarity index 98% rename from arch/mips/jmr3927/rbhma3100/kgdb_io.c rename to arch/mips/txx9/jmr3927/kgdb_io.c index 342579cfdc0..5bd757e56f7 100644 --- a/arch/mips/jmr3927/rbhma3100/kgdb_io.c +++ b/arch/mips/txx9/jmr3927/kgdb_io.c @@ -31,7 +31,7 @@ * 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #define TIMEOUT 0xffffff diff --git a/arch/mips/jmr3927/common/prom.c b/arch/mips/txx9/jmr3927/prom.c similarity index 84% rename from arch/mips/jmr3927/common/prom.c rename to arch/mips/txx9/jmr3927/prom.c index 5398813e50e..8bc1049b622 100644 --- a/arch/mips/jmr3927/common/prom.c +++ b/arch/mips/txx9/jmr3927/prom.c @@ -40,6 +40,7 @@ #include #include +#include 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/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/txx9/jmr3927/setup.c similarity index 99% rename from arch/mips/jmr3927/rbhma3100/setup.c rename to arch/mips/txx9/jmr3927/setup.c index f39c444e42d..41e0f3b3af2 100644 --- a/arch/mips/jmr3927/rbhma3100/setup.c +++ b/arch/mips/txx9/jmr3927/setup.c @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include extern void puts(const char *cp); diff --git a/arch/mips/txx9/rbtx4927/Makefile b/arch/mips/txx9/rbtx4927/Makefile new file mode 100644 index 00000000000..f3e1f597b4f --- /dev/null +++ b/arch/mips/txx9/rbtx4927/Makefile @@ -0,0 +1,3 @@ +obj-y += prom.o setup.o irq.o + +EXTRA_CFLAGS += -Werror diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c b/arch/mips/txx9/rbtx4927/irq.c similarity index 98% rename from arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c rename to arch/mips/txx9/rbtx4927/irq.c index c18901a75cc..936e50e91d9 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c +++ b/arch/mips/txx9/rbtx4927/irq.c @@ -1,6 +1,4 @@ /* - * linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c - * * Toshiba RBTX4927 specific interrupt handlers * * Author: MontaVista Software, Inc. @@ -116,7 +114,7 @@ JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB #ifdef CONFIG_TOSHIBA_FPCIB0 #include #endif -#include +#include #define TOSHIBA_RBTX4927_IRQ_IOC_RAW_BEG 0 #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 similarity index 98% rename from arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c rename to arch/mips/txx9/rbtx4927/prom.c index fdbad4bc602..0020bbee838 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c +++ b/arch/mips/txx9/rbtx4927/prom.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include void __init prom_init_cmdline(void) { diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/txx9/rbtx4927/setup.c similarity index 99% rename from arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c rename to arch/mips/txx9/rbtx4927/setup.c index 185f303c0e2..df1b6e99b66 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c +++ b/arch/mips/txx9/rbtx4927/setup.c @@ -59,9 +59,9 @@ #include #include #ifdef CONFIG_TOSHIBA_FPCIB0 -#include +#include #endif -#include +#include #ifdef CONFIG_SERIAL_TXX9 #include #endif diff --git a/arch/mips/tx4938/toshiba_rbtx4938/Makefile b/arch/mips/txx9/rbtx4938/Makefile similarity index 51% rename from arch/mips/tx4938/toshiba_rbtx4938/Makefile rename to arch/mips/txx9/rbtx4938/Makefile index 2316dd7dd1b..9dcc52ae5b9 100644 --- a/arch/mips/tx4938/toshiba_rbtx4938/Makefile +++ b/arch/mips/txx9/rbtx4938/Makefile @@ -1,7 +1,3 @@ -# -# Makefile for common code for Toshiba TX4927 based systems -# - obj-y += prom.o setup.o irq.o spi_eeprom.o EXTRA_CFLAGS += -Werror diff --git a/arch/mips/tx4938/toshiba_rbtx4938/irq.c b/arch/mips/txx9/rbtx4938/irq.c similarity index 97% rename from arch/mips/tx4938/toshiba_rbtx4938/irq.c rename to arch/mips/txx9/rbtx4938/irq.c index 4d6a8dc46c7..f4984820251 100644 --- a/arch/mips/tx4938/toshiba_rbtx4938/irq.c +++ b/arch/mips/txx9/rbtx4938/irq.c @@ -1,6 +1,4 @@ /* - * linux/arch/mips/tx4938/toshiba_rbtx4938/irq.c - * * Toshiba RBTX4938 specific interrupt handlers * Copyright (C) 2000-2001 Toshiba Corporation * @@ -68,7 +66,7 @@ IRQ Device */ #include #include -#include +#include static void toshiba_rbtx4938_irq_ioc_enable(unsigned int irq); static 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 similarity index 94% rename from arch/mips/tx4938/toshiba_rbtx4938/prom.c rename to arch/mips/txx9/rbtx4938/prom.c index 1644bffa501..134fcc2dc7d 100644 --- a/arch/mips/tx4938/toshiba_rbtx4938/prom.c +++ b/arch/mips/txx9/rbtx4938/prom.c @@ -1,6 +1,4 @@ /* - * linux/arch/mips/tx4938/toshiba_rbtx4938/prom.c - * * rbtx4938 specific prom routines * Copyright (C) 2000-2001 Toshiba Corporation * @@ -19,7 +17,7 @@ #include #include -#include +#include void __init prom_init_cmdline(void) { diff --git a/arch/mips/tx4938/toshiba_rbtx4938/setup.c b/arch/mips/txx9/rbtx4938/setup.c similarity index 99% rename from arch/mips/tx4938/toshiba_rbtx4938/setup.c rename to arch/mips/txx9/rbtx4938/setup.c index 3a3659e8633..bbd572c9675 100644 --- a/arch/mips/tx4938/toshiba_rbtx4938/setup.c +++ b/arch/mips/txx9/rbtx4938/setup.c @@ -1,6 +1,4 @@ /* - * linux/arch/mips/tx4938/toshiba_rbtx4938/setup.c - * * Setup pointers to hardware-dependent routines. * Copyright (C) 2000-2001 Toshiba Corporation * @@ -28,12 +26,12 @@ #include #include #include -#include +#include #ifdef CONFIG_SERIAL_TXX9 #include #endif #include -#include +#include #include extern char * __init prom_getcmdline(void); diff --git a/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c b/arch/mips/txx9/rbtx4938/spi_eeprom.c similarity index 96% rename from arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c rename to arch/mips/txx9/rbtx4938/spi_eeprom.c index 4d6b4ade5e8..a7ea8b041c1 100644 --- a/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c +++ b/arch/mips/txx9/rbtx4938/spi_eeprom.c @@ -1,5 +1,5 @@ /* - * linux/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c + * spi_eeprom.c * Copyright (C) 2000-2001 Toshiba Corporation * * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the @@ -13,7 +13,7 @@ #include #include #include -#include +#include #define AT250X0_PAGE_SIZE 8 diff --git a/include/asm-mips/jmr3927/jmr3927.h b/include/asm-mips/txx9/jmr3927.h similarity index 98% rename from include/asm-mips/jmr3927/jmr3927.h rename to include/asm-mips/txx9/jmr3927.h index a162268f17d..29e54981a86 100644 --- a/include/asm-mips/jmr3927/jmr3927.h +++ b/include/asm-mips/txx9/jmr3927.h @@ -7,10 +7,10 @@ * * Copyright (C) 2000-2001 Toshiba Corporation */ -#ifndef __ASM_TX3927_JMR3927_H -#define __ASM_TX3927_JMR3927_H +#ifndef __ASM_TXX9_JMR3927_H +#define __ASM_TXX9_JMR3927_H -#include +#include #include #include #include @@ -174,4 +174,4 @@ * INT[3:0] */ -#endif /* __ASM_TX3927_JMR3927_H */ +#endif /* __ASM_TXX9_JMR3927_H */ diff --git a/include/asm-mips/tx4927/toshiba_rbtx4927.h b/include/asm-mips/txx9/rbtx4927.h similarity index 92% rename from include/asm-mips/tx4927/toshiba_rbtx4927.h rename to include/asm-mips/txx9/rbtx4927.h index d6b32acd6b7..5531342bcc0 100644 --- a/include/asm-mips/tx4927/toshiba_rbtx4927.h +++ b/include/asm-mips/txx9/rbtx4927.h @@ -24,10 +24,10 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef __ASM_TX4927_TOSHIBA_RBTX4927_H -#define __ASM_TX4927_TOSHIBA_RBTX4927_H +#ifndef __ASM_TXX9_RBTX4927_H +#define __ASM_TXX9_RBTX4927_H -#include +#include #ifdef CONFIG_PCI #define TBTX4927_ISA_IO_OFFSET TX4927_PCIIO @@ -46,4 +46,4 @@ int toshiba_rbtx4927_irq_nested(int sw_irq); -#endif /* __ASM_TX4927_TOSHIBA_RBTX4927_H */ +#endif /* __ASM_TXX9_RBTX4927_H */ diff --git a/include/asm-mips/tx4938/rbtx4938.h b/include/asm-mips/txx9/rbtx4938.h similarity index 97% rename from include/asm-mips/tx4938/rbtx4938.h rename to include/asm-mips/txx9/rbtx4938.h index dfed7beb533..8450f735d05 100644 --- a/include/asm-mips/tx4938/rbtx4938.h +++ b/include/asm-mips/txx9/rbtx4938.h @@ -1,5 +1,4 @@ /* - * linux/include/asm-mips/tx4938/rbtx4938.h * Definitions for TX4937/TX4938 * * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the @@ -9,12 +8,12 @@ * * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com) */ -#ifndef __ASM_TX_BOARDS_RBTX4938_H -#define __ASM_TX_BOARDS_RBTX4938_H +#ifndef __ASM_TXX9_RBTX4938_H +#define __ASM_TXX9_RBTX4938_H #include -#include #include +#include /* CS */ #define RBTX4938_CE0 0x1c000000 /* 64M */ @@ -165,4 +164,4 @@ #define RBTX4938_RTL_8019_BASE (RBTX4938_ETHER_ADDR - mips_io_port_base) #define RBTX4938_RTL_8019_IRQ (RBTX4938_IRQ_ETHER) -#endif /* __ASM_TX_BOARDS_RBTX4938_H */ +#endif /* __ASM_TXX9_RBTX4938_H */ diff --git a/include/asm-mips/tx4927/smsc_fdc37m81x.h b/include/asm-mips/txx9/smsc_fdc37m81x.h similarity index 97% rename from include/asm-mips/tx4927/smsc_fdc37m81x.h rename to include/asm-mips/txx9/smsc_fdc37m81x.h index 5d93bab5125..9375e4fc228 100644 --- a/include/asm-mips/tx4927/smsc_fdc37m81x.h +++ b/include/asm-mips/txx9/smsc_fdc37m81x.h @@ -1,6 +1,4 @@ /* - * linux/include/asm-mips/tx4927/smsc_fdc37m81x.h - * * Interface for smsc fdc48m81x Super IO chip * * Author: MontaVista Software, Inc. source@mvista.com diff --git a/include/asm-mips/tx4938/spi.h b/include/asm-mips/txx9/spi.h similarity index 77% rename from include/asm-mips/tx4938/spi.h rename to include/asm-mips/txx9/spi.h index 6a60c83e152..ddfb2a0dc43 100644 --- a/include/asm-mips/tx4938/spi.h +++ b/include/asm-mips/txx9/spi.h @@ -1,5 +1,4 @@ /* - * linux/include/asm-mips/tx4938/spi.h * Definitions for TX4937/TX4938 SPI * * Copyright (C) 2000-2001 Toshiba Corporation @@ -11,10 +10,10 @@ * * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com) */ -#ifndef __ASM_TX_BOARDS_TX4938_SPI_H -#define __ASM_TX_BOARDS_TX4938_SPI_H +#ifndef __ASM_TXX9_SPI_H +#define __ASM_TXX9_SPI_H extern int spi_eeprom_register(int chipid); extern int spi_eeprom_read(int chipid, int address, unsigned char *buf, int len); -#endif /* __ASM_TX_BOARDS_TX4938_SPI_H */ +#endif /* __ASM_TXX9_SPI_H */ diff --git a/include/asm-mips/jmr3927/tx3927.h b/include/asm-mips/txx9/tx3927.h similarity index 98% rename from include/asm-mips/jmr3927/tx3927.h rename to include/asm-mips/txx9/tx3927.h index fb580333c10..63b62d6061f 100644 --- a/include/asm-mips/jmr3927/tx3927.h +++ b/include/asm-mips/txx9/tx3927.h @@ -5,10 +5,10 @@ * * Copyright (C) 2000 Toshiba Corporation */ -#ifndef __ASM_TX3927_H -#define __ASM_TX3927_H +#ifndef __ASM_TXX9_TX3927_H +#define __ASM_TXX9_TX3927_H -#include +#include #define TX3927_SDRAMC_REG 0xfffe8000 #define TX3927_ROMC_REG 0xfffe9000 @@ -316,4 +316,4 @@ struct tx3927_ccfg_reg { #define tx3927_sioptr(ch) ((struct txx927_sio_reg *)TX3927_SIO_REG(ch)) #define tx3927_pioptr ((struct txx9_pio_reg __iomem *)TX3927_PIO_REG) -#endif /* __ASM_TX3927_H */ +#endif /* __ASM_TXX9_TX3927_H */ diff --git a/include/asm-mips/tx4927/tx4927.h b/include/asm-mips/txx9/tx4927.h similarity index 99% rename from include/asm-mips/tx4927/tx4927.h rename to include/asm-mips/txx9/tx4927.h index 1d4816f3266..f21a7b1831e 100644 --- a/include/asm-mips/tx4927/tx4927.h +++ b/include/asm-mips/txx9/tx4927.h @@ -24,8 +24,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef __ASM_TX4927_TX4927_H -#define __ASM_TX4927_TX4927_H +#ifndef __ASM_TXX9_TX4927_H +#define __ASM_TXX9_TX4927_H #include @@ -277,4 +277,4 @@ struct tx4927_pcic_reg { #endif /* _LANGUAGE_ASSEMBLY */ -#endif /* __ASM_TX4927_TX4927_H */ +#endif /* __ASM_TXX9_TX4927_H */ diff --git a/include/asm-mips/tx4938/tx4938.h b/include/asm-mips/txx9/tx4938.h similarity index 99% rename from include/asm-mips/tx4938/tx4938.h rename to include/asm-mips/txx9/tx4938.h index e8807f5c61e..7f9cfef1c6d 100644 --- a/include/asm-mips/tx4938/tx4938.h +++ b/include/asm-mips/txx9/tx4938.h @@ -1,5 +1,4 @@ /* - * linux/include/asm-mips/tx4938/tx4938.h * Definitions for TX4937/TX4938 * Copyright (C) 2000-2001 Toshiba Corporation * @@ -10,8 +9,8 @@ * * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com) */ -#ifndef __ASM_TX_BOARDS_TX4938_H -#define __ASM_TX_BOARDS_TX4938_H +#ifndef __ASM_TXX9_TX4938_H +#define __ASM_TXX9_TX4938_H #define tx4938_read_nfmc(addr) (*(volatile unsigned int *)(addr)) #define tx4938_write_nfmc(b, addr) (*(volatile unsigned int *)(addr)) = (b) diff --git a/include/asm-mips/jmr3927/txx927.h b/include/asm-mips/txx9/txx927.h similarity index 97% rename from include/asm-mips/jmr3927/txx927.h rename to include/asm-mips/txx9/txx927.h index 25dcf2feb09..97dd7ad1a89 100644 --- a/include/asm-mips/jmr3927/txx927.h +++ b/include/asm-mips/txx9/txx927.h @@ -7,8 +7,8 @@ * * Copyright (C) 2000 Toshiba Corporation */ -#ifndef __ASM_TXX927_H -#define __ASM_TXX927_H +#ifndef __ASM_TXX9_TXX927_H +#define __ASM_TXX9_TXX927_H struct txx927_sio_reg { volatile unsigned long lcr; @@ -118,4 +118,4 @@ struct txx927_sio_reg { * PIO */ -#endif /* __ASM_TXX927_H */ +#endif /* __ASM_TXX9_TXX927_H */ -- 2.41.1