[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>

3 files changed, 69 insertions, 118 deletions

diff --git a/arch/mips/txx9/rbtx4927/irq.c b/arch/mips/txx9/rbtx4927/irq.c
index bef1447aeed2..70f13211bc2a 100644
--- a/arch/mips/txx9/rbtx4927/irq.c
+++ b/arch/mips/txx9/rbtx4927/irq.c
@@ -111,17 +111,10 @@ JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB
 #include <linux/types.h>
 #include <linux/interrupt.h>
 #include <asm/io.h>
+#include <asm/mipsregs.h>
+#include <asm/txx9/generic.h>
 #include <asm/txx9/rbtx4927.h>
 
-#define TOSHIBA_RBTX4927_IRQ_IOC_RAW_BEG   0
-#define TOSHIBA_RBTX4927_IRQ_IOC_RAW_END   7
-
-#define TOSHIBA_RBTX4927_IRQ_IOC_BEG  ((TX4927_IRQ_PIC_END+1)+TOSHIBA_RBTX4927_IRQ_IOC_RAW_BEG) /* 56 */
-#define TOSHIBA_RBTX4927_IRQ_IOC_END  ((TX4927_IRQ_PIC_END+1)+TOSHIBA_RBTX4927_IRQ_IOC_RAW_END) /* 63 */
-
-#define TOSHIBA_RBTX4927_IRQ_NEST_IOC_ON_PIC TX4927_IRQ_NEST_EXT_ON_PIC
-#define TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_IOC (TOSHIBA_RBTX4927_IRQ_IOC_BEG+2)
-
 static void toshiba_rbtx4927_irq_ioc_enable(unsigned int irq);
 static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq);
 
@@ -136,34 +129,25 @@ static struct irq_chip toshiba_rbtx4927_irq_ioc_type = {
 #define TOSHIBA_RBTX4927_IOC_INTR_ENAB (void __iomem *)0xbc002000UL
 #define TOSHIBA_RBTX4927_IOC_INTR_STAT (void __iomem *)0xbc002006UL
 
-int toshiba_rbtx4927_irq_nested(int sw_irq)
+static int toshiba_rbtx4927_irq_nested(int sw_irq)
 {
         u8 level3;
 
         level3 = readb(TOSHIBA_RBTX4927_IOC_INTR_STAT) & 0x1f;
         if (level3)
-                sw_irq = TOSHIBA_RBTX4927_IRQ_IOC_BEG + fls(level3) - 1;
+                sw_irq = RBTX4927_IRQ_IOC + fls(level3) - 1;
         return (sw_irq);
 }
 
-static struct irqaction toshiba_rbtx4927_irq_ioc_action = {
-        .handler        = no_action,
-        .flags          = IRQF_SHARED,
-        .mask           = CPU_MASK_NONE,
-        .name           = TOSHIBA_RBTX4927_IOC_NAME
-};
-
 static void __init toshiba_rbtx4927_irq_ioc_init(void)
 {
         int i;
 
-        for (i = TOSHIBA_RBTX4927_IRQ_IOC_BEG;
-             i <= TOSHIBA_RBTX4927_IRQ_IOC_END; i++)
+        for (i = RBTX4927_IRQ_IOC;
+             i < RBTX4927_IRQ_IOC + RBTX4927_NR_IRQ_IOC; i++)
                 set_irq_chip_and_handler(i, &toshiba_rbtx4927_irq_ioc_type,
                                          handle_level_irq);
-
-        setup_irq(TOSHIBA_RBTX4927_IRQ_NEST_IOC_ON_PIC,
-                  &toshiba_rbtx4927_irq_ioc_action);
+        set_irq_chained_handler(RBTX4927_IRQ_IOCINT, handle_simple_irq);
 }
 
 static void toshiba_rbtx4927_irq_ioc_enable(unsigned int irq)
@@ -171,7 +155,7 @@ static void toshiba_rbtx4927_irq_ioc_enable(unsigned int irq)
         unsigned char v;
 
         v = readb(TOSHIBA_RBTX4927_IOC_INTR_ENAB);
-        v |= (1 << (irq - TOSHIBA_RBTX4927_IRQ_IOC_BEG));
+        v |= (1 << (irq - RBTX4927_IRQ_IOC));
         writeb(v, TOSHIBA_RBTX4927_IOC_INTR_ENAB);
 }
 
@@ -180,15 +164,34 @@ static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq)
         unsigned char v;
 
         v = readb(TOSHIBA_RBTX4927_IOC_INTR_ENAB);
-        v &= ~(1 << (irq - TOSHIBA_RBTX4927_IRQ_IOC_BEG));
+        v &= ~(1 << (irq - RBTX4927_IRQ_IOC));
         writeb(v, TOSHIBA_RBTX4927_IOC_INTR_ENAB);
         mmiowb();
 }
 
-void __init arch_init_irq(void)
+
+static int rbtx4927_irq_dispatch(int pending)
 {
-        extern void tx4927_irq_init(void);
+        int irq;
+
+        if (pending & STATUSF_IP7)                      /* cpu timer */
+                irq = MIPS_CPU_IRQ_BASE + 7;
+        else if (pending & STATUSF_IP2) {               /* tx4927 pic */
+                irq = txx9_irq();
+                if (irq == RBTX4927_IRQ_IOCINT)
+                        irq = toshiba_rbtx4927_irq_nested(irq);
+        } else if (pending & STATUSF_IP0)               /* user line 0 */
+                irq = MIPS_CPU_IRQ_BASE + 0;
+        else if (pending & STATUSF_IP1)                 /* user line 1 */
+                irq = MIPS_CPU_IRQ_BASE + 1;
+        else
+                irq = -1;
+        return irq;
+}
 
+void __init rbtx4927_irq_setup(void)
+{
+        txx9_irq_dispatch = rbtx4927_irq_dispatch;
         tx4927_irq_init();
         toshiba_rbtx4927_irq_ioc_init();
         /* Onboard 10M Ether: High Active */
diff --git a/arch/mips/txx9/rbtx4927/prom.c b/arch/mips/txx9/rbtx4927/prom.c
index 0020bbee838b..942e627d2dc1 100644
--- a/arch/mips/txx9/rbtx4927/prom.c
+++ b/arch/mips/txx9/rbtx4927/prom.c
@@ -30,62 +30,16 @@
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <linux/init.h>
-#include <linux/string.h>
 #include <asm/bootinfo.h>
-#include <asm/cpu.h>
-#include <asm/mipsregs.h>
-#include <asm/txx9/tx4927.h>
+#include <asm/txx9/generic.h>
+#include <asm/txx9/rbtx4927.h>
 
-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)
+void __init rbtx4927_prom_init(void)
 {
         extern int tx4927_get_mem_size(void);
-        extern char* toshiba_name;
         int msize;
 
         prom_init_cmdline();
-
-        if ((read_c0_prid() & 0xff) == PRID_REV_TX4927) {
-                mips_machtype = MACH_TOSHIBA_RBTX4927;
-                toshiba_name  = "TX4927";
-        } else {
-                mips_machtype = MACH_TOSHIBA_RBTX4937;
-                toshiba_name  = "TX4937";
-        }
-
         msize = tx4927_get_mem_size();
         add_memory_region(0, msize << 20, BOOT_MEM_RAM);
 }
-
-void __init prom_free_prom_memory(void)
-{
-}
-
-const char *get_system_type(void)
-{
-        return "Toshiba RBTX4927/RBTX4937";
-}
-
-char * __init prom_getcmdline(void)
-{
-        return &(arcs_cmdline[0]);
-}
-
diff --git a/arch/mips/txx9/rbtx4927/setup.c b/arch/mips/txx9/rbtx4927/setup.c
index 86b870abc319..c3566c39c26c 100644
--- a/arch/mips/txx9/rbtx4927/setup.c
+++ b/arch/mips/txx9/rbtx4927/setup.c
@@ -49,7 +49,6 @@
 #include <linux/interrupt.h>
 #include <linux/pm.h>
 #include <linux/platform_device.h>
-#include <linux/clk.h>
 #include <linux/delay.h>
 
 #include <asm/bootinfo.h>
@@ -76,8 +75,6 @@ char *prom_getcmdline(void);
 
 static int tx4927_ccfg_toeon = 1;
 
-char *toshiba_name = "";
-
 #ifdef CONFIG_PCI
 static void __init tx4927_pci_setup(void)
 {
@@ -171,15 +168,15 @@ static void __init tx4937_pci_setup(void)
         }
 }
 
-static int __init rbtx4927_arch_init(void)
+static void __init rbtx4927_arch_init(void)
 {
         if (mips_machtype == MACH_TOSHIBA_RBTX4937)
                 tx4937_pci_setup();
         else
                 tx4927_pci_setup();
-        return 0;
 }
-arch_initcall(rbtx4927_arch_init);
+#else
+#define rbtx4927_arch_init NULL
 #endif /* CONFIG_PCI */
 
 static void __noreturn wait_forever(void)
@@ -223,14 +220,12 @@ void toshiba_rbtx4927_power_off(void)
         /* no return */
 }
 
-void __init plat_mem_setup(void)
+static void __init rbtx4927_mem_setup(void)
 {
         int i;
         u32 cp0_config;
         char *argptr;
 
-        printk("CPU is %s\n", toshiba_name);
-
         /* f/w leaves this on at startup */
         clear_c0_status(ST0_ERL);
 
@@ -323,7 +318,7 @@ void __init plat_mem_setup(void)
                         req.iotype = UPIO_MEM;
                         req.membase = (char *)(0xff1ff300 + i * 0x100);
                         req.mapbase = 0xff1ff300 + i * 0x100;
-                        req.irq = TX4927_IRQ_PIC_BEG + 8 + i;
+                        req.irq = TXX9_IRQ_BASE + TX4927_IR_SIO(i);
                         req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/;
                         req.uartclk = 50000000;
                         early_serial_txx9_setup(&req);
@@ -352,7 +347,7 @@ void __init plat_mem_setup(void)
 #endif
 }
 
-void __init plat_time_init(void)
+static void __init rbtx4927_time_init(void)
 {
         mips_hpt_frequency = txx9_cpu_clock / 2;
         if (____raw_readq(&tx4927_ccfgptr->ccfg) & TX4927_CCFG_TINTDIS)
@@ -372,7 +367,6 @@ static int __init toshiba_rbtx4927_rtc_init(void)
                 platform_device_register_simple("rtc-ds1742", -1, &res, 1);
         return IS_ERR(dev) ? PTR_ERR(dev) : 0;
 }
-device_initcall(toshiba_rbtx4927_rtc_init);
 
 static int __init rbtx4927_ne_init(void)
 {
@@ -391,7 +385,6 @@ static int __init rbtx4927_ne_init(void)
                                                 res, ARRAY_SIZE(res));
         return IS_ERR(dev) ? PTR_ERR(dev) : 0;
 }
-device_initcall(rbtx4927_ne_init);
 
 /* Watchdog support */
 
@@ -411,36 +404,37 @@ static int __init rbtx4927_wdt_init(void)
 {
         return txx9_wdt_init(TX4927_TMR_REG(2) & 0xfffffffffULL);
 }
-device_initcall(rbtx4927_wdt_init);
-
-/* Minimum CLK support */
-
-struct clk *clk_get(struct device *dev, const char *id)
-{
-        if (!strcmp(id, "imbus_clk"))
-                return (struct clk *)50000000;
-        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)
+static void __init rbtx4927_device_init(void)
 {
+        toshiba_rbtx4927_rtc_init();
+        rbtx4927_ne_init();
+        rbtx4927_wdt_init();
 }
-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);
+struct txx9_board_vec rbtx4927_vec __initdata = {
+        .type = MACH_TOSHIBA_RBTX4927,
+        .system = "Toshiba RBTX4927",
+        .prom_init = rbtx4927_prom_init,
+        .mem_setup = rbtx4927_mem_setup,
+        .irq_setup = rbtx4927_irq_setup,
+        .time_init = rbtx4927_time_init,
+        .device_init = rbtx4927_device_init,
+        .arch_init = rbtx4927_arch_init,
+#ifdef CONFIG_PCI
+        .pci_map_irq = rbtx4927_pci_map_irq,
+#endif
+};
+struct txx9_board_vec rbtx4937_vec __initdata = {
+        .type = MACH_TOSHIBA_RBTX4937,
+        .system = "Toshiba RBTX4937",
+        .prom_init = rbtx4927_prom_init,
+        .mem_setup = rbtx4927_mem_setup,
+        .irq_setup = rbtx4927_irq_setup,
+        .time_init = rbtx4927_time_init,
+        .device_init = rbtx4927_device_init,
+        .arch_init = rbtx4927_arch_init,
+#ifdef CONFIG_PCI
+        .pci_map_irq = rbtx4927_pci_map_irq,
+#endif
+};