[MIPS] TXx9: Make single kernel can support multiple boards

Make single kernel can be used on RBTX4927/37/38.  Also make
some SoC-specific code independent from board-specific code.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

5 files changed, 189 insertions, 59 deletions

diff --git a/arch/mips/txx9/generic/Makefile b/arch/mips/txx9/generic/Makefile
index b80b6e072284..668fdaad6448 100644
--- a/arch/mips/txx9/generic/Makefile
+++ b/arch/mips/txx9/generic/Makefile
@@ -4,8 +4,8 @@
 
 obj-y   += setup.o
 obj-$(CONFIG_PCI)       += pci.o
-obj-$(CONFIG_TOSHIBA_RBTX4927)  += mem_tx4927.o irq_tx4927.o
-obj-$(CONFIG_TOSHIBA_RBTX4938)  += mem_tx4938.o irq_tx4938.o
+obj-$(CONFIG_SOC_TX4927)        += mem_tx4927.o irq_tx4927.o
+obj-$(CONFIG_SOC_TX4938)        += mem_tx4938.o irq_tx4938.o
 obj-$(CONFIG_TOSHIBA_FPCIB0)    += smsc_fdc37m81x.o
 obj-$(CONFIG_KGDB)      += dbgio.o
 
diff --git a/arch/mips/txx9/generic/irq_tx4927.c b/arch/mips/txx9/generic/irq_tx4927.c
index 685ecc2ed551..6377bd8a9050 100644
--- a/arch/mips/txx9/generic/irq_tx4927.c
+++ b/arch/mips/txx9/generic/irq_tx4927.c
@@ -26,39 +26,12 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <asm/irq_cpu.h>
-#include <asm/mipsregs.h>
-#ifdef CONFIG_TOSHIBA_RBTX4927
-#include <asm/txx9/rbtx4927.h>
-#endif
+#include <asm/txx9/tx4927.h>
 
 void __init tx4927_irq_init(void)
 {
         mips_cpu_irq_init();
         txx9_irq_init(TX4927_IRC_REG);
-        set_irq_chained_handler(TX4927_IRQ_NEST_PIC_ON_CP0, handle_simple_irq);
-}
-
-asmlinkage void plat_irq_dispatch(void)
-{
-        unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM;
-
-        if (pending & STATUSF_IP7)                      /* cpu timer */
-                do_IRQ(TX4927_IRQ_CPU_TIMER);
-        else if (pending & STATUSF_IP2) {               /* tx4927 pic */
-                int irq = txx9_irq();
-#ifdef CONFIG_TOSHIBA_RBTX4927
-                if (irq == TX4927_IRQ_NEST_EXT_ON_PIC)
-                        irq = toshiba_rbtx4927_irq_nested(irq);
-#endif
-                if (unlikely(irq < 0)) {
-                        spurious_interrupt();
-                        return;
-                }
-                do_IRQ(irq);
-        } else if (pending & STATUSF_IP0)               /* user line 0 */
-                do_IRQ(TX4927_IRQ_USER0);
-        else if (pending & STATUSF_IP1)                 /* user line 1 */
-                do_IRQ(TX4927_IRQ_USER1);
-        else
-                spurious_interrupt();
+        set_irq_chained_handler(MIPS_CPU_IRQ_BASE + TX4927_IRC_INT,
+                                handle_simple_irq);
 }
diff --git a/arch/mips/txx9/generic/irq_tx4938.c b/arch/mips/txx9/generic/irq_tx4938.c
index 0886d9138818..5fc86c9c9d2f 100644
--- a/arch/mips/txx9/generic/irq_tx4938.c
+++ b/arch/mips/txx9/generic/irq_tx4938.c
@@ -14,35 +14,12 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <asm/irq_cpu.h>
-#include <asm/mipsregs.h>
-#include <asm/txx9/rbtx4938.h>
+#include <asm/txx9/tx4938.h>
 
-void __init
-tx4938_irq_init(void)
+void __init tx4938_irq_init(void)
 {
         mips_cpu_irq_init();
         txx9_irq_init(TX4938_IRC_REG);
-        set_irq_chained_handler(TX4938_IRQ_NEST_PIC_ON_CP0, handle_simple_irq);
-}
-
-int toshiba_rbtx4938_irq_nested(int irq);
-
-asmlinkage void plat_irq_dispatch(void)
-{
-        unsigned int pending = read_c0_cause() & read_c0_status();
-
-        if (pending & STATUSF_IP7)
-                do_IRQ(TX4938_IRQ_CPU_TIMER);
-        else if (pending & STATUSF_IP2) {
-                int irq = txx9_irq();
-                if (irq == TX4938_IRQ_PIC_BEG + TX4938_IR_INT(0))
-                        irq = toshiba_rbtx4938_irq_nested(irq);
-                if (irq >= 0)
-                        do_IRQ(irq);
-                else
-                        spurious_interrupt();
-        } else if (pending & STATUSF_IP1)
-                do_IRQ(TX4938_IRQ_USER1);
-        else if (pending & STATUSF_IP0)
-                do_IRQ(TX4938_IRQ_USER0);
+        set_irq_chained_handler(MIPS_CPU_IRQ_BASE + TX4938_IRC_INT,
+                                handle_simple_irq);
 }
diff --git a/arch/mips/txx9/generic/pci.c b/arch/mips/txx9/generic/pci.c
index 8173faab99bb..0b92d8c13208 100644
--- a/arch/mips/txx9/generic/pci.c
+++ b/arch/mips/txx9/generic/pci.c
@@ -16,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/jiffies.h>
 #include <linux/io.h>
+#include <asm/txx9/generic.h>
 #include <asm/txx9/pci.h>
 #ifdef CONFIG_TOSHIBA_FPCIB0
 #include <linux/interrupt.h>
@@ -375,3 +376,13 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_1,
 #endif
 DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, final_fixup);
 DECLARE_PCI_FIXUP_RESUME(PCI_ANY_ID, PCI_ANY_ID, final_fixup);
+
+int pcibios_plat_dev_init(struct pci_dev *dev)
+{
+        return 0;
+}
+
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+{
+        return txx9_board_vec->pci_map_irq(dev, slot, pin);
+}
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index 46a631177757..66ff74f80c6b 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -14,7 +14,16 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/string.h>
+#include <linux/module.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <asm/bootinfo.h>
 #include <asm/txx9/generic.h>
+#ifdef CONFIG_CPU_TX49XX
+#include <asm/txx9/tx4938.h>
+#endif
 
 /* EBUSC settings of TX4927, etc. */
 struct resource txx9_ce_res[8];
@@ -49,3 +58,163 @@ txx9_reg_res_init(unsigned int pcode, unsigned long base, unsigned long size)
 unsigned int txx9_master_clock;
 unsigned int txx9_cpu_clock;
 unsigned int txx9_gbus_clock;
+
+
+/* Minimum CLK support */
+
+struct clk *clk_get(struct device *dev, const char *id)
+{
+        if (!strcmp(id, "spi-baseclk"))
+                return (struct clk *)(txx9_gbus_clock / 2 / 4);
+        if (!strcmp(id, "imbus_clk"))
+                return (struct clk *)(txx9_gbus_clock / 2);
+        return ERR_PTR(-ENOENT);
+}
+EXPORT_SYMBOL(clk_get);
+
+int clk_enable(struct clk *clk)
+{
+        return 0;
+}
+EXPORT_SYMBOL(clk_enable);
+
+void clk_disable(struct clk *clk)
+{
+}
+EXPORT_SYMBOL(clk_disable);
+
+unsigned long clk_get_rate(struct clk *clk)
+{
+        return (unsigned long)clk;
+}
+EXPORT_SYMBOL(clk_get_rate);
+
+void clk_put(struct clk *clk)
+{
+}
+EXPORT_SYMBOL(clk_put);
+
+extern struct txx9_board_vec jmr3927_vec;
+extern struct txx9_board_vec rbtx4927_vec;
+extern struct txx9_board_vec rbtx4937_vec;
+extern struct txx9_board_vec rbtx4938_vec;
+
+/* board definitions */
+static struct txx9_board_vec *board_vecs[] __initdata = {
+#ifdef CONFIG_TOSHIBA_JMR3927
+        &jmr3927_vec,
+#endif
+#ifdef CONFIG_TOSHIBA_RBTX4927
+        &rbtx4927_vec,
+        &rbtx4937_vec,
+#endif
+#ifdef CONFIG_TOSHIBA_RBTX4938
+        &rbtx4938_vec,
+#endif
+};
+struct txx9_board_vec *txx9_board_vec __initdata;
+static char txx9_system_type[32];
+
+void __init prom_init_cmdline(void)
+{
+        int argc = (int)fw_arg0;
+        char **argv = (char **)fw_arg1;
+        int i;                  /* Always ignore the "-c" at argv[0] */
+
+        /* ignore all built-in args if any f/w args given */
+        if (argc > 1)
+                *arcs_cmdline = '\0';
+
+        for (i = 1; i < argc; i++) {
+                if (i != 1)
+                        strcat(arcs_cmdline, " ");
+                strcat(arcs_cmdline, argv[i]);
+        }
+}
+
+void __init prom_init(void)
+{
+        int i;
+
+#ifdef CONFIG_CPU_TX39XX
+        mips_machtype = MACH_TOSHIBA_JMR3927;
+#endif
+#ifdef CONFIG_CPU_TX49XX
+        switch (TX4938_REV_PCODE()) {
+        case 0x4927:
+                mips_machtype = MACH_TOSHIBA_RBTX4927;
+                break;
+        case 0x4937:
+                mips_machtype = MACH_TOSHIBA_RBTX4937;
+                break;
+        case 0x4938:
+                mips_machtype = MACH_TOSHIBA_RBTX4938;
+                break;
+        }
+#endif
+        for (i = 0; i < ARRAY_SIZE(board_vecs); i++) {
+                if (board_vecs[i]->type == mips_machtype) {
+                        txx9_board_vec = board_vecs[i];
+                        strcpy(txx9_system_type, txx9_board_vec->system);
+                        return txx9_board_vec->prom_init();
+                }
+        }
+}
+
+void __init prom_free_prom_memory(void)
+{
+}
+
+const char *get_system_type(void)
+{
+        return txx9_system_type;
+}
+
+char * __init prom_getcmdline(void)
+{
+        return &(arcs_cmdline[0]);
+}
+
+/* wrappers */
+void __init plat_mem_setup(void)
+{
+        txx9_board_vec->mem_setup();
+}
+
+void __init arch_init_irq(void)
+{
+        txx9_board_vec->irq_setup();
+}
+
+void __init plat_time_init(void)
+{
+        txx9_board_vec->time_init();
+}
+
+static int __init _txx9_arch_init(void)
+{
+        if (txx9_board_vec->arch_init)
+                txx9_board_vec->arch_init();
+        return 0;
+}
+arch_initcall(_txx9_arch_init);
+
+static int __init _txx9_device_init(void)
+{
+        if (txx9_board_vec->device_init)
+                txx9_board_vec->device_init();
+        return 0;
+}
+device_initcall(_txx9_device_init);
+
+int (*txx9_irq_dispatch)(int pending);
+asmlinkage void plat_irq_dispatch(void)
+{
+        int pending = read_c0_status() & read_c0_cause() & ST0_IM;
+        int irq = txx9_irq_dispatch(pending);
+
+        if (likely(irq >= 0))
+                do_IRQ(irq);
+        else
+                spurious_interrupt();
+}