sh: MS7712SE01 board support.

Support the SH7712 (SH3-DSP) Solution Engine reference board.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

10 files changed, 95 insertions, 15 deletions

diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug
index 931c620dbc24..be60def6f306 100644
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -33,6 +33,7 @@ config EARLY_SCIF_CONSOLE_PORT
         default "0xffe00000" if CPU_SUBTYPE_SH7780
         default "0xfffe9800" if CPU_SUBTYPE_SH7206
         default "0xf8420000" if CPU_SUBTYPE_SH7619
+        default "0xa4400000" if CPU_SUBTYPE_SH7712
         default "0xffe80000" if CPU_SH4
 
 config EARLY_PRINTK
diff --git a/arch/sh/boards/se/770x/io.c b/arch/sh/boards/se/770x/io.c
index 9941949331ab..c4550473d4c3 100644
--- a/arch/sh/boards/se/770x/io.c
+++ b/arch/sh/boards/se/770x/io.c
@@ -27,6 +27,8 @@ int sh_pcic_io_dummy;
 static inline volatile __u16 *
 port2adr(unsigned int port)
 {
+        if (port & 0xff000000)
+                return ( volatile __u16 *) port;
         if (port >= 0x2000)
                 return (volatile __u16 *) (PA_MRSHPC + (port - 0x2000));
         else if (port >= 0x1000)
diff --git a/arch/sh/boards/se/770x/irq.c b/arch/sh/boards/se/770x/irq.c
index 307ca5da6232..59cdffa13964 100644
--- a/arch/sh/boards/se/770x/irq.c
+++ b/arch/sh/boards/se/770x/irq.c
@@ -55,6 +55,17 @@ void make_se770x_irq(struct ipr_data *table, unsigned int nr_irqs)
 }
 
 static struct ipr_data se770x_ipr_map[] = {
+        /*
+        * Super I/O (Just mimic PC):
+        *  1: keyboard
+        *  3: serial 0
+        *  4: serial 1
+        *  5: printer
+        *  6: floppy
+        *  8: rtc
+        * 12: mouse
+        * 14: ide0
+         */
 #if defined(CONFIG_CPU_SUBTYPE_SH7705)
         /* This is default value */
         { 0xf-0x2, 0, 8,  0x2 , BCR_ILCRA},
@@ -81,8 +92,10 @@ static struct ipr_data se770x_ipr_map[] = {
         {  4, 0,  4, 0x0f- 4 ,BCR_ILCRC},
         {  3, 0,  0, 0x0f- 3 ,BCR_ILCRC},
         {  1, 0, 12, 0x0f- 1 ,BCR_ILCRD},
+#if defined(CONFIG_STNIC)
         /* ST NIC */
         { 10, 0,  4, 0x0f-10 ,BCR_ILCRD},       /* LAN */
+#endif
         /* MRSHPC IRQs setting */
         {  0, 0, 12, 0x0f- 0 ,BCR_ILCRE},       /* PCIRQ3 */
         { 11, 0,  8, 0x0f-11 ,BCR_ILCRE},       /* PCIRQ2 */
@@ -100,18 +113,6 @@ static struct ipr_data se770x_ipr_map[] = {
  */
 void __init init_se_IRQ(void)
 {
-        /*
-         * Super I/O (Just mimic PC):
-         *  1: keyboard
-         *  3: serial 0
-         *  4: serial 1
-         *  5: printer
-         *  6: floppy
-         *  8: rtc
-         * 12: mouse
-         * 14: ide0
-         */
-#if defined(CONFIG_CPU_SUBTYPE_SH7705)
         /* Disable all interrupts */
         ctrl_outw(0, BCR_ILCRA);
         ctrl_outw(0, BCR_ILCRB);
@@ -120,6 +121,6 @@ void __init init_se_IRQ(void)
         ctrl_outw(0, BCR_ILCRE);
         ctrl_outw(0, BCR_ILCRF);
         ctrl_outw(0, BCR_ILCRG);
-#endif
+
         make_se770x_irq(se770x_ipr_map, ARRAY_SIZE(se770x_ipr_map));
 }
diff --git a/arch/sh/boards/se/770x/setup.c b/arch/sh/boards/se/770x/setup.c
index dab5510699a0..f1c7c8d9fdd2 100644
--- a/arch/sh/boards/se/770x/setup.c
+++ b/arch/sh/boards/se/770x/setup.c
@@ -117,7 +117,7 @@ static int __init se_devices_setup(void)
 {
         return platform_add_devices(se_devices, ARRAY_SIZE(se_devices));
 }
-__initcall(se_devices_setup);
+device_initcall(se_devices_setup);
 
 /*
  * The Machine Vector
@@ -133,6 +133,8 @@ struct sh_machine_vector mv_se __initmv = {
         .mv_nr_irqs             = 61,
 #elif defined(CONFIG_CPU_SUBTYPE_SH7705)
         .mv_nr_irqs             = 86,
+#elif defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7712)
+        .mv_nr_irqs             = 104,
 #endif
 
         .mv_inb                 = se_inb,
diff --git a/arch/sh/kernel/cpu/sh3/Makefile b/arch/sh/kernel/cpu/sh3/Makefile
index 83905e4e4387..09faa056cd43 100644
--- a/arch/sh/kernel/cpu/sh3/Makefile
+++ b/arch/sh/kernel/cpu/sh3/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_CPU_SUBTYPE_SH7708)	+= setup-sh7708.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7709)        += setup-sh7709.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7300)        += setup-sh7300.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7710)        += setup-sh7710.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7712)        += setup-sh7710.o
 
 # Primary on-chip clocks (common)
 clock-$(CONFIG_CPU_SH3)                 := clock-sh3.o
diff --git a/arch/sh/kernel/cpu/sh3/probe.c b/arch/sh/kernel/cpu/sh3/probe.c
index 821b0ab7b528..647623b22edc 100644
--- a/arch/sh/kernel/cpu/sh3/probe.c
+++ b/arch/sh/kernel/cpu/sh3/probe.c
@@ -78,6 +78,9 @@ int __init detect_cpu_and_cache_system(void)
 #if defined(CONFIG_CPU_SUBTYPE_SH7710)
                 current_cpu_data.type = CPU_SH7710;
 #endif
+#if defined(CONFIG_CPU_SUBTYPE_SH7712)
+                current_cpu_data.type = CPU_SH7712;
+#endif
 #if defined(CONFIG_CPU_SUBTYPE_SH7705)
                 current_cpu_data.type = CPU_SH7705;
 
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7710.c b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
index 895f99ee6a95..51760a7e7f1c 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7710.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
@@ -2,6 +2,7 @@
  * SH7710 Setup
  *
  *  Copyright (C) 2006  Paul Mundt
+ *  Copyright (C) 2007  Nobuhiro Iwamatsu
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -19,6 +20,12 @@ static struct plat_sci_port sci_platform_data[] = {
                 .type           = PORT_SCIF,
                 .irqs           = { 52, 53, 55, 54 },
         }, {
+                .mapbase        = 0xa4420000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 56, 57, 59, 58 },
+        }, {
+
                 .flags = 0,
         }
 };
@@ -41,3 +48,56 @@ static int __init sh7710_devices_setup(void)
                                     ARRAY_SIZE(sh7710_devices));
 }
 __initcall(sh7710_devices_setup);
+
+static struct ipr_data sh7710_ipr_map[] = {
+        /* IRQ, IPR-idx, shift, priority */
+        { 16, 0, 12, 2 }, /* TMU0 TUNI*/
+        { 17, 0,  8, 2 }, /* TMU1 TUNI */
+        { 18, 0,  4, 2 }, /* TMU2 TUNI */
+        { 27, 1, 12, 2 }, /* WDT ITI */
+        { 20, 0,  0, 2 }, /* RTC ATI (alarm) */
+        { 21, 0,  0, 2 }, /* RTC PRI (period) */
+        { 22, 0,  0, 2 }, /* RTC CUI (carry) */
+        { 48, 4, 12, 7 }, /* DMAC DMTE0 */
+        { 49, 4, 12, 7 }, /* DMAC DMTE1 */
+        { 50, 4, 12, 7 }, /* DMAC DMTE2 */
+        { 51, 4, 12, 7 }, /* DMAC DMTE3 */
+        { 52, 4,  8, 3 }, /* SCIF0 ERI */
+        { 53, 4,  8, 3 }, /* SCIF0 RXI */
+        { 54, 4,  8, 3 }, /* SCIF0 BRI */
+        { 55, 4,  8, 3 }, /* SCIF0 TXI */
+        { 56, 4,  4, 3 }, /* SCIF1 ERI */
+        { 57, 4,  4, 3 }, /* SCIF1 RXI */
+        { 58, 4,  4, 3 }, /* SCIF1 BRI */
+        { 59, 4,  4, 3 }, /* SCIF1 TXI */
+        { 76, 5,  8, 7 }, /* DMAC DMTE4 */
+        { 77, 5,  8, 7 }, /* DMAC DMTE5 */
+        { 80, 6, 12, 5 }, /* EDMAC EINT0 */
+        { 81, 6,  8, 5 }, /* EDMAC EINT1 */
+        { 82, 6,  4, 5 }, /* EDMAC EINT2 */
+};
+
+static unsigned long ipr_offsets[] = {
+        0xA414FEE2      /* 0: IPRA */
+,       0xA414FEE4      /* 1: IPRB */
+,       0xA4140016      /* 2: IPRC */
+,       0xA4140018      /* 3: IPRD */
+,       0xA414001A      /* 4: IPRE */
+,       0xA4080000      /* 5: IPRF */
+,       0xA4080002      /* 6: IPRG */
+,       0xA4080004      /* 7: IPRH */
+,       0xA4080006      /* 8: IPRI */
+};
+
+/* given the IPR index return the address of the IPR register */
+unsigned int map_ipridx_to_addr(int idx)
+{
+        if (idx >= ARRAY_SIZE(ipr_offsets))
+                return 0;
+        return ipr_offsets[idx];
+}
+
+void __init init_IRQ_ipr()
+{
+        make_ipr_irq(sh7710_ipr_map, ARRAY_SIZE(sh7710_ipr_map));
+}
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index e7607366ac4e..286c80388bf5 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -299,7 +299,8 @@ static void ubc_set_tracing(int asid, unsigned long pc)
         ctrl_outl(0, UBC_BAMRA);
 
         if (current_cpu_data.type == CPU_SH7729 ||
-            current_cpu_data.type == CPU_SH7710) {
+            current_cpu_data.type == CPU_SH7710 || 
+            current_cpu_data.type == CPU_SH7712 ) {
                 ctrl_outw(BBR_INST | BBR_READ | BBR_CPU, UBC_BBRA);
                 ctrl_outl(BRCR_PCBA | BRCR_PCTE, UBC_BRCR);
         } else {
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index f96490419768..4d6d89115194 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -377,6 +377,7 @@ static const char *cpu_name[] = {
         [CPU_SH7705]    = "SH7705",     [CPU_SH7706]    = "SH7706",
         [CPU_SH7707]    = "SH7707",     [CPU_SH7708]    = "SH7708",
         [CPU_SH7709]    = "SH7709",     [CPU_SH7710]    = "SH7710",
+        [CPU_SH7712]    = "SH7712",
         [CPU_SH7729]    = "SH7729",     [CPU_SH7750]    = "SH7750",
         [CPU_SH7750S]   = "SH7750S",    [CPU_SH7750R]   = "SH7750R",
         [CPU_SH7751]    = "SH7751",     [CPU_SH7751R]   = "SH7751R",
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 6b0d28ac9241..3cac22f50e15 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -101,9 +101,17 @@ config CPU_SUBTYPE_SH7709
 config CPU_SUBTYPE_SH7710
         bool "Support SH7710 processor"
         select CPU_SH3
+        select CPU_HAS_IPR_IRQ
         help
           Select SH7710 if you have a SH3-DSP SH7710 CPU.
 
+config CPU_SUBTYPE_SH7712
+        bool "Support SH7712 processor"
+        select CPU_SH3
+        select CPU_HAS_IPR_IRQ
+        help
+          Select SH7712 if you have a SH3-DSP SH7712 CPU.
+
 comment "SH-4 Processor Support"
 
 config CPU_SUBTYPE_SH7750