sh: Add SH7720 CPU support.

This adds support for the SH7720 (SH3-DSP) CPU.

Signed-off by: Markus Brunner <super.firetwister@gmail.com>
Signed-off by: Mark Jonas <toertel@gmail.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

10 files changed, 271 insertions, 9 deletions

diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug
index 6eb31bcc1e21..c870f5fdef34 100644
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -34,6 +34,7 @@ config EARLY_SCIF_CONSOLE_PORT
         default "0xfffe9800" if CPU_SUBTYPE_SH7206
         default "0xf8420000" if CPU_SUBTYPE_SH7619
         default "0xa4400000" if CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7705
+        default "0xa4430000" if CPU_SUBTYPE_SH7720
         default "0xffc30000" if CPU_SUBTYPE_SHX3
         default "0xffe80000" if CPU_SH4
         default "0x00000000"
diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig
index ee711431e504..4e711a0c3dae 100644
--- a/arch/sh/drivers/dma/Kconfig
+++ b/arch/sh/drivers/dma/Kconfig
@@ -12,6 +12,7 @@ config SH_DMA
 config NR_ONCHIP_DMA_CHANNELS
         int
         depends on SH_DMA
+        default "6" if CPU_SUBTYPE_SH7720
         default "8" if CPU_SUBTYPE_SH7750R || CPU_SUBTYPE_SH7751R
         default "12" if CPU_SUBTYPE_SH7780
         default "4"
diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c
index 06ed0609a95d..6e5f16cb0aa5 100644
--- a/arch/sh/drivers/dma/dma-sh.c
+++ b/arch/sh/drivers/dma/dma-sh.c
@@ -24,13 +24,18 @@ static int dmte_irq_map[] = {
         DMTE1_IRQ,
         DMTE2_IRQ,
         DMTE3_IRQ,
-#if defined(CONFIG_CPU_SUBTYPE_SH7751R) ||      \
+#if defined(CONFIG_CPU_SUBTYPE_SH7720)  ||      \
+    defined(CONFIG_CPU_SUBTYPE_SH7751R) ||      \
     defined(CONFIG_CPU_SUBTYPE_SH7760)  ||      \
     defined(CONFIG_CPU_SUBTYPE_SH7780)
         DMTE4_IRQ,
         DMTE5_IRQ,
+#endif
+#if defined(CONFIG_CPU_SUBTYPE_SH7751R) ||      \
+    defined(CONFIG_CPU_SUBTYPE_SH7760)  ||      \
+    defined(CONFIG_CPU_SUBTYPE_SH7780)
         DMTE6_IRQ,
-        DMTE7_IRQ,    
+        DMTE7_IRQ,
 #endif
 };
 
@@ -196,7 +201,8 @@ static int sh_dmac_get_dma_residue(struct dma_channel *chan)
         return ctrl_inl(DMATCR[chan->chan]) << calc_xmit_shift(chan);
 }
 
-#ifdef CONFIG_CPU_SUBTYPE_SH7780
+#if defined(CONFIG_CPU_SUBTYPE_SH7720) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7780)
 #define dmaor_read_reg()        ctrl_inw(DMAOR)
 #define dmaor_write_reg(data)   ctrl_outw(data, DMAOR)
 #else
diff --git a/arch/sh/kernel/cpu/sh3/Makefile b/arch/sh/kernel/cpu/sh3/Makefile
index cd2a35270e30..646eb6933614 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-sh770x.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7709)        += setup-sh770x.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7710)        += setup-sh7710.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7712)        += setup-sh7710.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7720)        += setup-sh7720.o
 
 # Primary on-chip clocks (common)
 clock-$(CONFIG_CPU_SH3)                 := clock-sh3.o
@@ -19,5 +20,6 @@ clock-$(CONFIG_CPU_SUBTYPE_SH7705)	:= clock-sh7705.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7706)      := clock-sh7706.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7709)      := clock-sh7709.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7710)      := clock-sh7710.o
+clock-$(CONFIG_CPU_SUBTYPE_SH7720)      := clock-sh7710.o
 
 obj-y   += $(clock-y)
diff --git a/arch/sh/kernel/cpu/sh3/probe.c b/arch/sh/kernel/cpu/sh3/probe.c
index 647623b22edc..1a66cf636a9d 100644
--- a/arch/sh/kernel/cpu/sh3/probe.c
+++ b/arch/sh/kernel/cpu/sh3/probe.c
@@ -81,6 +81,9 @@ int __init detect_cpu_and_cache_system(void)
 #if defined(CONFIG_CPU_SUBTYPE_SH7712)
                 current_cpu_data.type = CPU_SH7712;
 #endif
+#if defined(CONFIG_CPU_SUBTYPE_SH7720)
+                current_cpu_data.type = CPU_SH7720;
+#endif
 #if defined(CONFIG_CPU_SUBTYPE_SH7705)
                 current_cpu_data.type = CPU_SH7705;
 
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7720.c b/arch/sh/kernel/cpu/sh3/setup-sh7720.c
new file mode 100644
index 000000000000..a0929b8a95ae
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7720.c
@@ -0,0 +1,210 @@
+/*
+ * SH7720 Setup
+ *
+ *  Copyright (C) 2007  Markus Brunner, Mark Jonas
+ *
+ *  Based on arch/sh/kernel/cpu/sh4/setup-sh7750.c:
+ *
+ *  Copyright (C) 2006  Paul Mundt
+ *  Copyright (C) 2006  Jamie Lenehan
+ *
+ * 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
+ * for more details.
+ */
+#include <linux/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <linux/io.h>
+#include <asm/sci.h>
+#include <asm/rtc.h>
+
+#define INTC_ICR1       0xA4140010UL
+#define INTC_ICR_IRLM   0x4000
+#define INTC_ICR_IRQ    (~INTC_ICR_IRLM)
+
+static struct resource rtc_resources[] = {
+        [0] = {
+                .start  = 0xa413fec0,
+                .end    = 0xa413fec0 + 0x28 - 1,
+                .flags  = IORESOURCE_IO,
+        },
+        [1] = {
+                /* Period IRQ */
+                .start  = 21,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = {
+                /* Carry IRQ */
+                .start  = 22,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [3] = {
+                /* Alarm IRQ */
+                .start  = 20,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct sh_rtc_platform_info rtc_info = {
+        .capabilities   = RTC_CAP_4_DIGIT_YEAR,
+};
+
+static struct platform_device rtc_device = {
+        .name           = "sh-rtc",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(rtc_resources),
+        .resource       = rtc_resources,
+        .dev            = {
+                .platform_data = &rtc_info,
+        },
+};
+
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xa4430000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 80, 80, 80, 80 },
+        }, {
+                .mapbase        = 0xa4438000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 81, 81, 81, 81 },
+        }, {
+
+                .flags = 0,
+        }
+};
+
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+
+static struct platform_device *sh7720_devices[] __initdata = {
+        &rtc_device,
+        &sci_device,
+};
+
+static int __init sh7720_devices_setup(void)
+{
+        return platform_add_devices(sh7720_devices,
+                                    ARRAY_SIZE(sh7720_devices));
+}
+__initcall(sh7720_devices_setup);
+
+enum {
+        UNUSED = 0,
+
+        /* interrupt sources */
+        TMU0, TMU1, TMU2, RTC_ATI, RTC_PRI, RTC_CUI,
+        WDT, REF_RCMI, SIM_ERI, SIM_RXI, SIM_TXI, SIM_TEND,
+        IRQ0, IRQ1, IRQ2, IRQ3,
+        USBF_SPD, TMU_SUNI, IRQ5, IRQ4,
+        DMAC1_DEI0, DMAC1_DEI1, DMAC1_DEI2, DMAC1_DEI3, LCDC, SSL,
+        ADC, DMAC2_DEI4, DMAC2_DEI5, USBFI0, USBFI1, CMT,
+        SCIF0, SCIF1,
+        PINT07, PINT815, TPU0, TPU1, TPU2, TPU3, IIC,
+        SIOF0, SIOF1, MMCI0, MMCI1, MMCI2, MMCI3, PCC,
+        USBHI, AFEIF,
+        H_UDI,
+        /* interrupt groups */
+        TMU, RTC, SIM, DMAC1, USBFI, DMAC2, USB, TPU, MMC,
+};
+
+static struct intc_vect vectors[] __initdata = {
+        INTC_VECT(TMU0, 0x400),       INTC_VECT(TMU1, 0x420),
+        INTC_VECT(TMU2, 0x440),       INTC_VECT(RTC_ATI, 0x480),
+        INTC_VECT(RTC_PRI, 0x4a0),    INTC_VECT(RTC_CUI, 0x4c0),
+        INTC_VECT(SIM_ERI, 0x4e0),    INTC_VECT(SIM_RXI, 0x500),
+        INTC_VECT(SIM_TXI, 0x520),    INTC_VECT(SIM_TEND, 0x540),
+        INTC_VECT(WDT, 0x560),        INTC_VECT(REF_RCMI, 0x580),
+        /* H_UDI cannot be masked */  INTC_VECT(TMU_SUNI, 0x6c0),
+        INTC_VECT(USBF_SPD, 0x6e0),   INTC_VECT(DMAC1_DEI0, 0x800),
+        INTC_VECT(DMAC1_DEI1, 0x820), INTC_VECT(DMAC1_DEI2, 0x840),
+        INTC_VECT(DMAC1_DEI3, 0x860), INTC_VECT(LCDC, 0x900),
+        INTC_VECT(SSL, 0x980),        INTC_VECT(USBFI0, 0xa20),
+        INTC_VECT(USBFI1, 0xa40),     INTC_VECT(USBHI, 0xa60),
+        INTC_VECT(DMAC2_DEI4, 0xb80), INTC_VECT(DMAC2_DEI5, 0xba0),
+        INTC_VECT(ADC, 0xbe0),        INTC_VECT(SCIF0, 0xc00),
+        INTC_VECT(SCIF1, 0xc20),      INTC_VECT(PINT07, 0xc80),
+        INTC_VECT(PINT815, 0xca0),    INTC_VECT(SIOF0, 0xd00),
+        INTC_VECT(SIOF1, 0xd20),      INTC_VECT(TPU0, 0xd80),
+        INTC_VECT(TPU1, 0xda0),       INTC_VECT(TPU2, 0xdc0),
+        INTC_VECT(TPU3, 0xde0),       INTC_VECT(IIC, 0xe00),
+        INTC_VECT(MMCI0, 0xe80),      INTC_VECT(MMCI1, 0xea0),
+        INTC_VECT(MMCI2, 0xec0),      INTC_VECT(MMCI3, 0xee0),
+        INTC_VECT(CMT, 0xf00),        INTC_VECT(PCC, 0xf60),
+        INTC_VECT(AFEIF, 0xfe0),
+};
+
+static struct intc_group groups[] __initdata = {
+        INTC_GROUP(TMU, TMU0, TMU1, TMU2),
+        INTC_GROUP(RTC, RTC_ATI, RTC_PRI, RTC_CUI),
+        INTC_GROUP(SIM, SIM_ERI, SIM_RXI, SIM_TXI, SIM_TEND),
+        INTC_GROUP(DMAC1, DMAC1_DEI0, DMAC1_DEI1, DMAC1_DEI2, DMAC1_DEI3),
+        INTC_GROUP(USBFI, USBFI0, USBFI1),
+        INTC_GROUP(DMAC2, DMAC2_DEI4, DMAC2_DEI5),
+        INTC_GROUP(TPU, TPU0, TPU1, TPU2, TPU3),
+        INTC_GROUP(MMC, MMCI0, MMCI1, MMCI2, MMCI3),
+};
+
+static struct intc_prio priorities[] __initdata = {
+        INTC_PRIO(SCIF0, 2),
+        INTC_PRIO(SCIF1, 2),
+        INTC_PRIO(DMAC1, 1),
+        INTC_PRIO(DMAC2, 1),
+        INTC_PRIO(RTC, 2),
+        INTC_PRIO(TMU, 2),
+        INTC_PRIO(TPU, 2),
+};
+
+static struct intc_prio_reg prio_registers[] __initdata = {
+        { 0xA414FEE2UL, 0, 16, 4, /* IPRA */ { TMU0, TMU1, TMU2, RTC } },
+        { 0xA414FEE4UL, 0, 16, 4, /* IPRB */ { WDT, REF_RCMI, SIM, 0 } },
+        { 0xA4140016UL, 0, 16, 4, /* IPRC */ { IRQ3, IRQ2, IRQ1, IRQ0 } },
+        { 0xA4140018UL, 0, 16, 4, /* IPRD */ { USBF_SPD, TMU_SUNI, IRQ5, IRQ4 } },
+        { 0xA414001AUL, 0, 16, 4, /* IPRE */ { DMAC1, 0, LCDC, SSL } },
+        { 0xA4080000UL, 0, 16, 4, /* IPRF */ { ADC, DMAC2, USBFI, CMT } },
+        { 0xA4080002UL, 0, 16, 4, /* IPRG */ { SCIF0, SCIF1, 0, 0 } },
+        { 0xA4080004UL, 0, 16, 4, /* IPRH */ { PINT07, PINT815, TPU, IIC } },
+        { 0xA4080006UL, 0, 16, 4, /* IPRI */ { SIOF0, SIOF1, MMC, PCC } },
+        { 0xA4080008UL, 0, 16, 4, /* IPRJ */ { 0, USBHI, 0, AFEIF } },
+};
+
+static DECLARE_INTC_DESC(intc_desc, "sh7720", vectors, groups,
+                priorities, NULL, prio_registers, NULL);
+
+static struct intc_sense_reg sense_registers[] __initdata = {
+        { INTC_ICR1, 16, 2, { 0, 0, IRQ5, IRQ4, IRQ3, IRQ2, IRQ1, IRQ0 } },
+};
+
+static struct intc_vect vectors_irq[] __initdata = {
+        INTC_VECT(IRQ0, 0x600), INTC_VECT(IRQ1, 0x620),
+        INTC_VECT(IRQ2, 0x640), INTC_VECT(IRQ3, 0x660),
+        INTC_VECT(IRQ4, 0x680), INTC_VECT(IRQ5, 0x6a0),
+};
+
+static DECLARE_INTC_DESC(intc_irq_desc, "sh7720-irq", vectors_irq,
+                NULL, priorities, NULL, prio_registers, sense_registers);
+
+void __init plat_irq_setup_pins(int mode)
+{
+        switch (mode) {
+        case IRQ_MODE_IRQ:
+                ctrl_outw(ctrl_inw(INTC_ICR1) & INTC_ICR_IRQ, INTC_ICR1);
+                register_intc_controller(&intc_irq_desc);
+                break;
+        default:
+                BUG();
+        }
+}
+
+void __init plat_irq_setup(void)
+{
+        register_intc_controller(&intc_desc);
+}
diff --git a/arch/sh/kernel/early_printk.c b/arch/sh/kernel/early_printk.c
index 80b637c30203..85ed5b7ef278 100644
--- a/arch/sh/kernel/early_printk.c
+++ b/arch/sh/kernel/early_printk.c
@@ -13,6 +13,7 @@
 #include <linux/tty.h>
 #include <linux/init.h>
 #include <linux/io.h>
+#include <linux/delay.h>
 
 #ifdef CONFIG_SH_STANDARD_BIOS
 #include <asm/sh_bios.h>
@@ -62,6 +63,18 @@ static struct console bios_console = {
 #include <linux/serial_core.h>
 #include "../../../drivers/serial/sh-sci.h"
 
+#if defined(CONFIG_CPU_SUBTYPE_SH7720)
+#define EPK_SCSMR_VALUE 0x000
+#define EPK_SCBRR_VALUE 0x00C
+#define EPK_FIFO_SIZE 64
+#define EPK_FIFO_BITS (0x7f00 >> 8)
+#else
+#define EPK_FIFO_SIZE 16
+#define EPK_FIFO_BITS (0x1f00 >> 8)
+#endif
+
+
+
 static struct uart_port scif_port = {
         .mapbase        = CONFIG_EARLY_SCIF_CONSOLE_PORT,
         .membase        = (char __iomem *)CONFIG_EARLY_SCIF_CONSOLE_PORT,
@@ -69,7 +82,7 @@ static struct uart_port scif_port = {
 
 static void scif_sercon_putc(int c)
 {
-        while (((sci_in(&scif_port, SCFDR) & 0x1f00 >> 8) == 16))
+        while (((sci_in(&scif_port, SCFDR) & EPK_FIFO_BITS) >= EPK_FIFO_SIZE))
                 ;
 
         sci_out(&scif_port, SCxTDR, c);
@@ -105,7 +118,22 @@ static struct console scif_console = {
         .index          = -1,
 };
 
-#if defined(CONFIG_CPU_SH4) && !defined(CONFIG_SH_STANDARD_BIOS)
+#if !defined(CONFIG_SH_STANDARD_BIOS)
+#if defined(CONFIG_CPU_SUBTYPE_SH7720)
+static void scif_sercon_init(char *s)
+{
+        sci_out(&scif_port, SCSCR, 0x0000);     /* clear TE and RE */
+        sci_out(&scif_port, SCFCR, 0x4006);     /* reset */
+        sci_out(&scif_port, SCSCR, 0x0000);     /* select internal clock */
+        sci_out(&scif_port, SCSMR, EPK_SCSMR_VALUE);
+        sci_out(&scif_port, SCBRR, EPK_SCBRR_VALUE);
+
+        mdelay(1);      /* wait 1-bit time */
+
+        sci_out(&scif_port, SCFCR, 0x0030);     /* TTRG=b'11 */
+        sci_out(&scif_port, SCSCR, 0x0030);     /* TE, RE */
+}
+#elif defined(CONFIG_CPU_SH4)
 #define DEFAULT_BAUD 115200
 /*
  * Simple SCIF init, primarily aimed at SH7750 and other similar SH-4
@@ -146,7 +174,8 @@ static void scif_sercon_init(char *s)
         ctrl_outw(0, scif_port.mapbase + 36);
         ctrl_outw(0x30, scif_port.mapbase + 8);
 }
-#endif /* CONFIG_CPU_SH4 && !CONFIG_SH_STANDARD_BIOS */
+#endif /* defined(CONFIG_CPU_SUBTYPE_SH7720) */
+#endif /* !defined(CONFIG_SH_STANDARD_BIOS) */
 #endif /* CONFIG_EARLY_SCIF_CONSOLE */
 
 /*
@@ -186,7 +215,8 @@ int __init setup_early_printk(char *buf)
         if (!strncmp(buf, "serial", 6)) {
                 early_console = &scif_console;
 
-#if defined(CONFIG_CPU_SH4) && !defined(CONFIG_SH_STANDARD_BIOS)
+#if (defined(CONFIG_CPU_SH4) || defined(CONFIG_CPU_SUBTYPE_SH7720)) && \
+    !defined(CONFIG_SH_STANDARD_BIOS)
                 scif_sercon_init(buf + 6);
 #endif
         }
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 2cf7dec0d690..e0e655cba89c 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -279,7 +279,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_SH7712]    = "SH7712",     [CPU_SH7720]    = "SH7720",
         [CPU_SH7729]    = "SH7729",     [CPU_SH7750]    = "SH7750",
         [CPU_SH7750S]   = "SH7750S",    [CPU_SH7750R]   = "SH7750R",
         [CPU_SH7751]    = "SH7751",     [CPU_SH7751R]   = "SH7751R",
diff --git a/arch/sh/kernel/timers/timer-tmu.c b/arch/sh/kernel/timers/timer-tmu.c
index 8a545d54e2d3..628ec9a15e38 100644
--- a/arch/sh/kernel/timers/timer-tmu.c
+++ b/arch/sh/kernel/timers/timer-tmu.c
@@ -173,7 +173,8 @@ static int tmu_timer_init(void)
 
         tmu_timer_stop();
 
-#if !defined(CONFIG_CPU_SUBTYPE_SH7760) && \
+#if !defined(CONFIG_CPU_SUBTYPE_SH7720) && \
+    !defined(CONFIG_CPU_SUBTYPE_SH7760) && \
     !defined(CONFIG_CPU_SUBTYPE_SH7785) && \
     !defined(CONFIG_CPU_SUBTYPE_SHX3)
         ctrl_outb(TMU_TOCR_INIT, TMU_TOCR);
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index e5801d9aac3f..5487b99d4f6d 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -111,6 +111,14 @@ config CPU_SUBTYPE_SH7712
         help
           Select SH7712 if you have a SH3-DSP SH7712 CPU.
 
+config CPU_SUBTYPE_SH7720
+        bool "Support SH7720 processor"
+        select CPU_SH3
+        select CPU_HAS_INTC_IRQ
+        select CPU_HAS_DSP
+        help
+          Select SH7720 if you have a SH3-DSP SH7720 CPU.
+
 # SH-4 Processor Support
 
 config CPU_SUBTYPE_SH7750