5 files changed, 328 insertions, 12 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index df2e2f99b902..6a679c3e15e8 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -276,6 +276,15 @@ config CPU_SUBTYPE_SH4_202
 
 # SH-4A Processor Support
 
+config CPU_SUBTYPE_SH7723
+        bool "Support SH7723 processor"
+        select CPU_SH4A
+        select CPU_SHX2
+        select ARCH_SPARSEMEM_ENABLE
+        select SYS_SUPPORTS_NUMA
+        help
+          Select SH7723 if you have an SH-MobileR2 CPU.
+
 config CPU_SUBTYPE_SH7763
         bool "Support SH7763 processor"
         select CPU_SH4A
@@ -600,7 +609,7 @@ config SH_PCLK_FREQ
         default "27000000" if CPU_SUBTYPE_SH7343
         default "31250000" if CPU_SUBTYPE_SH7619
         default "32000000" if CPU_SUBTYPE_SH7722
-        default "33333333" if CPU_SUBTYPE_SH7770 || \
+        default "33333333" if CPU_SUBTYPE_SH7770 || CPU_SUBTYPE_SH7723 || \
                               CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7705 || \
                               CPU_SUBTYPE_SH7203 || CPU_SUBTYPE_SH7206 || \
                               CPU_SUBTYPE_SH7263 || CPU_SUBTYPE_MXG
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index 9e89984c4f1d..c478b16dbf4b 100644
--- a/arch/sh/kernel/cpu/sh4/probe.c
+++ b/arch/sh/kernel/cpu/sh4/probe.c
@@ -126,17 +126,22 @@ int __init detect_cpu_and_cache_system(void)
                                           CPU_HAS_LLSC;
                 break;
         case 0x3008:
-                if (prr == 0xa0 || prr == 0xa1) {
-                        boot_cpu_data.type = CPU_SH7722;
-                        boot_cpu_data.icache.ways = 4;
-                        boot_cpu_data.dcache.ways = 4;
-                        boot_cpu_data.flags |= CPU_HAS_LLSC;
-                }
-                else if (prr == 0x70) {
+                boot_cpu_data.icache.ways = 4;
+                boot_cpu_data.dcache.ways = 4;
+                boot_cpu_data.flags |= CPU_HAS_LLSC;
+
+                switch (prr) {
+                case 0x50:
+                        boot_cpu_data.type = CPU_SH7723;
+                        boot_cpu_data.flags |= CPU_HAS_FPU | CPU_HAS_L2_CACHE;
+                        break;
+                case 0x70:
                         boot_cpu_data.type = CPU_SH7366;
-                        boot_cpu_data.icache.ways = 4;
-                        boot_cpu_data.dcache.ways = 4;
-                        boot_cpu_data.flags |= CPU_HAS_LLSC;
+                        break;
+                case 0xa0:
+                case 0xa1:
+                        boot_cpu_data.type = CPU_SH7722;
+                        break;
                 }
                 break;
         case 0x4000:    /* 1st cut */
diff --git a/arch/sh/kernel/cpu/sh4a/Makefile b/arch/sh/kernel/cpu/sh4a/Makefile
index 5d890ac8e793..a880e7968750 100644
--- a/arch/sh/kernel/cpu/sh4a/Makefile
+++ b/arch/sh/kernel/cpu/sh4a/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_CPU_SUBTYPE_SH7780)	+= setup-sh7780.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7785)        += setup-sh7785.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7343)        += setup-sh7343.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7722)        += setup-sh7722.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7723)        += setup-sh7723.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7366)        += setup-sh7366.o
 obj-$(CONFIG_CPU_SUBTYPE_SHX3)          += setup-shx3.o
 
@@ -22,6 +23,7 @@ clock-$(CONFIG_CPU_SUBTYPE_SH7780)	:= clock-sh7780.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7785)      := clock-sh7785.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7343)      := clock-sh7343.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7722)      := clock-sh7722.o
+clock-$(CONFIG_CPU_SUBTYPE_SH7723)      := clock-sh7722.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7366)      := clock-sh7722.o
 clock-$(CONFIG_CPU_SUBTYPE_SHX3)        := clock-shx3.o
 
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
new file mode 100644
index 000000000000..16925cf28db8
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
@@ -0,0 +1,300 @@
+/*
+ * SH7723 Setup
+ *
+ *  Copyright (C) 2008  Paul Mundt
+ *
+ * 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/mm.h>
+#include <linux/serial_sci.h>
+#include <asm/mmzone.h>
+
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xa4e30000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCI,
+                .irqs           = { 56, 56, 56, 56 },
+        },{
+                .mapbase        = 0xa4e40000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCI,
+                .irqs           = { 88, 88, 88, 88 },
+        },{
+                .mapbase        = 0xa4e50000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCI,
+                .irqs           = { 109, 109, 109, 109 },
+        }, {
+                .flags = 0,
+        }
+};
+
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+
+static struct resource rtc_resources[] = {
+        [0] = {
+                .start  = 0xa465fec0,
+                .end    = 0xa465fec0 + 0x58 - 1,
+                .flags  = IORESOURCE_IO,
+        },
+        [1] = {
+                /* Period IRQ */
+                .start  = 69,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = {
+                /* Carry IRQ */
+                .start  = 70,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [3] = {
+                /* Alarm IRQ */
+                .start  = 68,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device rtc_device = {
+        .name           = "sh-rtc",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(rtc_resources),
+        .resource       = rtc_resources,
+};
+
+static struct platform_device *sh7723_devices[] __initdata = {
+        &sci_device,
+        &rtc_device,
+};
+
+static int __init sh7723_devices_setup(void)
+{
+        return platform_add_devices(sh7723_devices,
+                                    ARRAY_SIZE(sh7723_devices));
+}
+__initcall(sh7723_devices_setup);
+
+enum {
+        UNUSED=0,
+
+        /* interrupt sources */
+        IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7,
+        HUDI,
+        DMAC1A_DEI0,DMAC1A_DEI1,DMAC1A_DEI2,DMAC1A_DEI3,
+        _2DG_TRI,_2DG_INI,_2DG_CEI,
+        DMAC0A_DEI0,DMAC0A_DEI1,DMAC0A_DEI2,DMAC0A_DEI3,
+        VIO_CEUI,VIO_BEUI,VIO_VEU2HI,VIO_VOUI,
+        SCIFA_SCIFA0,
+        VPU_VPUI,
+        TPU_TPUI,
+        ADC_ADI,
+        USB_USI0,
+        RTC_ATI,RTC_PRI,RTC_CUI,
+        DMAC1B_DEI4,DMAC1B_DEI5,DMAC1B_DADERR,
+        DMAC0B_DEI4,DMAC0B_DEI5,DMAC0B_DADERR,
+        KEYSC_KEYI,
+        SCIF_SCIF0,SCIF_SCIF1,SCIF_SCIF2,
+        MSIOF_MSIOFI0,MSIOF_MSIOFI1,
+        SCIFA_SCIFA1,
+        FLCTL_FLSTEI,FLCTL_FLTENDI,FLCTL_FLTREQ0I,FLCTL_FLTREQ1I,
+        I2C_ALI,I2C_TACKI,I2C_WAITI,I2C_DTEI,
+        SDHI0_SDHII0,SDHI0_SDHII1,SDHI0_SDHII2,
+        CMT_CMTI,
+        TSIF_TSIFI,
+        SIU_SIUI,
+        SCIFA_SCIFA2,
+        TMU0_TUNI0, TMU0_TUNI1, TMU0_TUNI2,
+        IRDA_IRDAI,
+        ATAPI_ATAPII,
+        SDHI1_SDHII0,SDHI1_SDHII1,SDHI1_SDHII2,
+        VEU2H1_VEU2HI,
+        LCDC_LCDCI,
+        TMU1_TUNI0,TMU1_TUNI1,TMU1_TUNI2,
+
+        /* interrupt groups */
+        DMAC1A, DMAC0A, VIO, DMAC0B, FLCTL, I2C, _2DG,
+        SDHI1, RTC, DMAC1B, SDHI0,
+};
+
+static struct intc_vect vectors[] __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),
+        INTC_VECT(IRQ6, 0x6c0), INTC_VECT(IRQ7, 0x6e0),
+
+        INTC_VECT(DMAC1A_DEI0,0x700),
+        INTC_VECT(DMAC1A_DEI1,0x720),
+        INTC_VECT(DMAC1A_DEI2,0x740),
+        INTC_VECT(DMAC1A_DEI3,0x760),
+
+        INTC_VECT(_2DG_TRI, 0x780),
+        INTC_VECT(_2DG_INI, 0x7A0),
+        INTC_VECT(_2DG_CEI, 0x7C0),
+
+        INTC_VECT(DMAC0A_DEI0,0x800),
+        INTC_VECT(DMAC0A_DEI1,0x820),
+        INTC_VECT(DMAC0A_DEI2,0x840),
+        INTC_VECT(DMAC0A_DEI3,0x860),
+
+        INTC_VECT(VIO_CEUI,0x880),
+        INTC_VECT(VIO_BEUI,0x8A0),
+        INTC_VECT(VIO_VEU2HI,0x8C0),
+        INTC_VECT(VIO_VOUI,0x8E0),
+
+        INTC_VECT(SCIFA_SCIFA0,0x900),
+        INTC_VECT(VPU_VPUI,0x920),
+        INTC_VECT(TPU_TPUI,0x9A0),
+        INTC_VECT(ADC_ADI,0x9E0),
+        INTC_VECT(USB_USI0,0xA20),
+
+        INTC_VECT(RTC_ATI,0xA80),
+        INTC_VECT(RTC_PRI,0xAA0),
+        INTC_VECT(RTC_CUI,0xAC0),
+
+        INTC_VECT(DMAC1B_DEI4,0xB00),
+        INTC_VECT(DMAC1B_DEI5,0xB20),
+        INTC_VECT(DMAC1B_DADERR,0xB40),
+
+        INTC_VECT(DMAC0B_DEI4,0xB80),
+        INTC_VECT(DMAC0B_DEI5,0xBA0),
+        INTC_VECT(DMAC0B_DADERR,0xBC0),
+
+        INTC_VECT(KEYSC_KEYI,0xBE0),
+        INTC_VECT(SCIF_SCIF0,0xC00),
+        INTC_VECT(SCIF_SCIF1,0xC20),
+        INTC_VECT(SCIF_SCIF2,0xC40),
+        INTC_VECT(MSIOF_MSIOFI0,0xC80),
+        INTC_VECT(MSIOF_MSIOFI1,0xCA0),
+        INTC_VECT(SCIFA_SCIFA1,0xD00),
+
+        INTC_VECT(FLCTL_FLSTEI,0xD80),
+        INTC_VECT(FLCTL_FLTENDI,0xDA0),
+        INTC_VECT(FLCTL_FLTREQ0I,0xDC0),
+        INTC_VECT(FLCTL_FLTREQ1I,0xDE0),
+
+        INTC_VECT(I2C_ALI,0xE00),
+        INTC_VECT(I2C_TACKI,0xE20),
+        INTC_VECT(I2C_WAITI,0xE40),
+        INTC_VECT(I2C_DTEI,0xE60),
+
+        INTC_VECT(SDHI0_SDHII0,0xE80),
+        INTC_VECT(SDHI0_SDHII1,0xEA0),
+        INTC_VECT(SDHI0_SDHII2,0xEC0),
+
+        INTC_VECT(CMT_CMTI,0xF00),
+        INTC_VECT(TSIF_TSIFI,0xF20),
+        INTC_VECT(SIU_SIUI,0xF80),
+        INTC_VECT(SCIFA_SCIFA2,0xFA0),
+
+        INTC_VECT(TMU0_TUNI0,0x400),
+        INTC_VECT(TMU0_TUNI1,0x420),
+        INTC_VECT(TMU0_TUNI2,0x440),
+
+        INTC_VECT(IRDA_IRDAI,0x480),
+        INTC_VECT(ATAPI_ATAPII,0x4A0),
+
+        INTC_VECT(SDHI1_SDHII0,0x4E0),
+        INTC_VECT(SDHI1_SDHII1,0x500),
+        INTC_VECT(SDHI1_SDHII2,0x520),
+
+        INTC_VECT(VEU2H1_VEU2HI,0x560),
+        INTC_VECT(LCDC_LCDCI,0x580),
+
+        INTC_VECT(TMU1_TUNI0,0x920),
+        INTC_VECT(TMU1_TUNI1,0x940),
+        INTC_VECT(TMU1_TUNI2,0x960),
+
+};
+
+static struct intc_group groups[] __initdata = {
+        INTC_GROUP(DMAC1A,DMAC1A_DEI0,DMAC1A_DEI1,DMAC1A_DEI2,DMAC1A_DEI3),
+        INTC_GROUP(DMAC0A,DMAC0A_DEI0,DMAC0A_DEI1,DMAC0A_DEI2,DMAC0A_DEI3),
+        INTC_GROUP(VIO, VIO_CEUI,VIO_BEUI,VIO_VEU2HI,VIO_VOUI),
+        INTC_GROUP(DMAC0B, DMAC0B_DEI4,DMAC0B_DEI5,DMAC0B_DADERR),
+        INTC_GROUP(FLCTL,FLCTL_FLSTEI,FLCTL_FLTENDI,FLCTL_FLTREQ0I,FLCTL_FLTREQ1I),
+        INTC_GROUP(I2C,I2C_ALI,I2C_TACKI,I2C_WAITI,I2C_DTEI),
+        INTC_GROUP(_2DG, _2DG_TRI,_2DG_INI,_2DG_CEI),
+        INTC_GROUP(SDHI1, SDHI1_SDHII0,SDHI1_SDHII1,SDHI1_SDHII2),
+        INTC_GROUP(RTC, RTC_ATI,RTC_PRI,RTC_CUI),
+        INTC_GROUP(DMAC1B, DMAC1B_DEI4,DMAC1B_DEI5,DMAC1B_DADERR),
+        INTC_GROUP(SDHI0,SDHI0_SDHII0,SDHI0_SDHII1,SDHI0_SDHII2),
+};
+
+static struct intc_mask_reg mask_registers[] __initdata = {
+        { 0xa4080080, 0xa40800c0, 8, /* IMR0 / IMCR0 */
+          { 0,  TMU1_TUNI2,TMU1_TUNI1,TMU1_TUNI0,0,SDHI1_SDHII2,SDHI1_SDHII1,SDHI1_SDHII0} },
+        { 0xa4080084, 0xa40800c4, 8, /* IMR1 / IMCR1 */
+          { VIO_VOUI, VIO_VEU2HI,VIO_BEUI,VIO_CEUI,DMAC0A_DEI3,DMAC0A_DEI2,DMAC0A_DEI1,DMAC0A_DEI0 } },
+        { 0xa4080088, 0xa40800c8, 8, /* IMR2 / IMCR2 */
+          { 0, 0, 0, VPU_VPUI,0,0,0,SCIFA_SCIFA0 } },
+        { 0xa408008c, 0xa40800cc, 8, /* IMR3 / IMCR3 */
+          { DMAC1A_DEI3,DMAC1A_DEI2,DMAC1A_DEI1,DMAC1A_DEI0,0,0,0,IRDA_IRDAI } },
+        { 0xa4080090, 0xa40800d0, 8, /* IMR4 / IMCR4 */
+          { 0,TMU0_TUNI2,TMU0_TUNI1,TMU0_TUNI0,VEU2H1_VEU2HI,0,0,LCDC_LCDCI } },
+        { 0xa4080094, 0xa40800d4, 8, /* IMR5 / IMCR5 */
+          { KEYSC_KEYI,DMAC0B_DADERR,DMAC0B_DEI5,DMAC0B_DEI4,0,SCIF_SCIF2,SCIF_SCIF1,SCIF_SCIF0 } },
+        { 0xa4080098, 0xa40800d8, 8, /* IMR6 / IMCR6 */
+          { 0,0,0,SCIFA_SCIFA1,ADC_ADI,0,MSIOF_MSIOFI1,MSIOF_MSIOFI0 } },
+        { 0xa408009c, 0xa40800dc, 8, /* IMR7 / IMCR7 */
+          { I2C_DTEI, I2C_WAITI, I2C_TACKI, I2C_ALI,
+            FLCTL_FLTREQ1I, FLCTL_FLTREQ0I, FLCTL_FLTENDI, FLCTL_FLSTEI } },
+        { 0xa40800a0, 0xa40800e0, 8, /* IMR8 / IMCR8 */
+          { 0,SDHI0_SDHII2,SDHI0_SDHII1,SDHI0_SDHII0,0,0,SCIFA_SCIFA2,SIU_SIUI } },
+        { 0xa40800a4, 0xa40800e4, 8, /* IMR9 / IMCR9 */
+          { 0, 0, 0, CMT_CMTI, 0, 0, USB_USI0,0 } },
+        { 0xa40800a8, 0xa40800e8, 8, /* IMR10 / IMCR10 */
+          { 0, DMAC1B_DADERR,DMAC1B_DEI5,DMAC1B_DEI4,0,RTC_ATI,RTC_PRI,RTC_CUI } },
+        { 0xa40800ac, 0xa40800ec, 8, /* IMR11 / IMCR11 */
+          { 0,_2DG_CEI,_2DG_INI,_2DG_TRI,0,TPU_TPUI,0,TSIF_TSIFI } },
+        { 0xa40800b0, 0xa40800f0, 8, /* IMR12 / IMCR12 */
+          { 0,0,0,0,0,0,0,ATAPI_ATAPII } },
+        { 0xa4140044, 0xa4140064, 8, /* INTMSK00 / INTMSKCLR00 */
+          { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },
+};
+
+static struct intc_prio_reg prio_registers[] __initdata = {
+        { 0xa4080000, 0, 16, 4, /* IPRA */ { TMU0_TUNI0, TMU0_TUNI1, TMU0_TUNI2, IRDA_IRDAI } },
+        { 0xa4080004, 0, 16, 4, /* IPRB */ { VEU2H1_VEU2HI, LCDC_LCDCI, DMAC1A, 0} },
+        { 0xa4080008, 0, 16, 4, /* IPRC */ { TMU1_TUNI0, TMU1_TUNI1, TMU1_TUNI2, 0} },
+        { 0xa408000c, 0, 16, 4, /* IPRD */ { } },
+        { 0xa4080010, 0, 16, 4, /* IPRE */ { DMAC0A, VIO, SCIFA_SCIFA0, VPU_VPUI } },
+        { 0xa4080014, 0, 16, 4, /* IPRF */ { KEYSC_KEYI, DMAC0B, USB_USI0, CMT_CMTI } },
+        { 0xa4080018, 0, 16, 4, /* IPRG */ { SCIF_SCIF0, SCIF_SCIF1, SCIF_SCIF2,0 } },
+        { 0xa408001c, 0, 16, 4, /* IPRH */ { MSIOF_MSIOFI0,MSIOF_MSIOFI1, FLCTL, I2C } },
+        { 0xa4080020, 0, 16, 4, /* IPRI */ { SCIFA_SCIFA1,0,TSIF_TSIFI,_2DG } },
+        { 0xa4080024, 0, 16, 4, /* IPRJ */ { ADC_ADI,0,SIU_SIUI,SDHI1 } },
+        { 0xa4080028, 0, 16, 4, /* IPRK */ { RTC,DMAC1B,0,SDHI0 } },
+        { 0xa408002c, 0, 16, 4, /* IPRL */ { SCIFA_SCIFA2,0,TPU_TPUI,ATAPI_ATAPII } },
+        { 0xa4140010, 0, 32, 4, /* INTPRI00 */
+          { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },
+};
+
+static struct intc_sense_reg sense_registers[] __initdata = {
+        { 0xa414001c, 16, 2, /* ICR1 */
+          { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },
+};
+
+static DECLARE_INTC_DESC(intc_desc, "sh7723", vectors, groups,
+                         mask_registers, prio_registers, sense_registers);
+
+void __init plat_irq_setup(void)
+{
+        register_intc_controller(&intc_desc);
+}
+
+void __init plat_mem_setup(void)
+{
+        /* Register the URAM space as Node 1 */
+        setup_bootmem_node(1, 0x055f0000, 0x05610000);
+}
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 0ee776888c65..284f66f1ebbe 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -335,7 +335,7 @@ static const char *cpu_name[] = {
         [CPU_SH7343]    = "SH7343",     [CPU_SH7785]    = "SH7785",
         [CPU_SH7722]    = "SH7722",     [CPU_SHX3]      = "SH-X3",
         [CPU_SH5_101]   = "SH5-101",    [CPU_SH5_103]   = "SH5-103",
-        [CPU_MXG]       = "MX-G",
+        [CPU_MXG]       = "MX-G",       [CPU_SH7723]    = "SH7723",
         [CPU_SH7366]    = "SH7366",     [CPU_SH_NONE]   = "Unknown"
 };