1 files changed, 114 insertions, 43 deletions

diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
index 7e585320710..81657091da4 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
@@ -1,7 +1,7 @@
 /*
  * SH7786 Setup
  *
- * Copyright (C) 2009  Renesas Solutions Corp.
+ * Copyright (C) 2009 - 2010  Renesas Solutions Corp.
  * Kuninori Morimoto <morimoto.kuninori@renesas.com>
  * Paul Mundt <paul.mundt@renesas.com>
  *
@@ -21,7 +21,10 @@
 #include <linux/mm.h>
 #include <linux/dma-mapping.h>
 #include <linux/sh_timer.h>
+#include <linux/sh_intc.h>
+#include <cpu/dma-register.h>
 #include <asm/mmzone.h>
+#include <asm/dmaengine.h>
 
 static struct plat_sci_port scif0_platform_data = {
         .mapbase        = 0xffea0000,
@@ -117,16 +120,13 @@ static struct platform_device scif5_device = {
 };
 
 static struct sh_timer_config tmu0_platform_data = {
-        .name = "TMU0",
         .channel_offset = 0x04,
         .timer_bit = 0,
-        .clk = "peripheral_clk",
         .clockevent_rating = 200,
 };
 
 static struct resource tmu0_resources[] = {
         [0] = {
-                .name   = "TMU0",
                 .start  = 0xffd80008,
                 .end    = 0xffd80013,
                 .flags  = IORESOURCE_MEM,
@@ -148,16 +148,13 @@ static struct platform_device tmu0_device = {
 };
 
 static struct sh_timer_config tmu1_platform_data = {
-        .name = "TMU1",
         .channel_offset = 0x10,
         .timer_bit = 1,
-        .clk = "peripheral_clk",
         .clocksource_rating = 200,
 };
 
 static struct resource tmu1_resources[] = {
         [0] = {
-                .name   = "TMU1",
                 .start  = 0xffd80014,
                 .end    = 0xffd8001f,
                 .flags  = IORESOURCE_MEM,
@@ -179,15 +176,12 @@ static struct platform_device tmu1_device = {
 };
 
 static struct sh_timer_config tmu2_platform_data = {
-        .name = "TMU2",
         .channel_offset = 0x1c,
         .timer_bit = 2,
-        .clk = "peripheral_clk",
 };
 
 static struct resource tmu2_resources[] = {
         [0] = {
-                .name   = "TMU2",
                 .start  = 0xffd80020,
                 .end    = 0xffd8002f,
                 .flags  = IORESOURCE_MEM,
@@ -209,15 +203,12 @@ static struct platform_device tmu2_device = {
 };
 
 static struct sh_timer_config tmu3_platform_data = {
-        .name = "TMU3",
         .channel_offset = 0x04,
         .timer_bit = 0,
-        .clk = "peripheral_clk",
 };
 
 static struct resource tmu3_resources[] = {
         [0] = {
-                .name   = "TMU3",
                 .start  = 0xffda0008,
                 .end    = 0xffda0013,
                 .flags  = IORESOURCE_MEM,
@@ -239,15 +230,12 @@ static struct platform_device tmu3_device = {
 };
 
 static struct sh_timer_config tmu4_platform_data = {
-        .name = "TMU4",
         .channel_offset = 0x10,
         .timer_bit = 1,
-        .clk = "peripheral_clk",
 };
 
 static struct resource tmu4_resources[] = {
         [0] = {
-                .name   = "TMU4",
                 .start  = 0xffda0014,
                 .end    = 0xffda001f,
                 .flags  = IORESOURCE_MEM,
@@ -269,15 +257,12 @@ static struct platform_device tmu4_device = {
 };
 
 static struct sh_timer_config tmu5_platform_data = {
-        .name = "TMU5",
         .channel_offset = 0x1c,
         .timer_bit = 2,
-        .clk = "peripheral_clk",
 };
 
 static struct resource tmu5_resources[] = {
         [0] = {
-                .name   = "TMU5",
                 .start  = 0xffda0020,
                 .end    = 0xffda002b,
                 .flags  = IORESOURCE_MEM,
@@ -299,15 +284,12 @@ static struct platform_device tmu5_device = {
 };
 
 static struct sh_timer_config tmu6_platform_data = {
-        .name = "TMU6",
         .channel_offset = 0x04,
         .timer_bit = 0,
-        .clk = "peripheral_clk",
 };
 
 static struct resource tmu6_resources[] = {
         [0] = {
-                .name   = "TMU6",
                 .start  = 0xffdc0008,
                 .end    = 0xffdc0013,
                 .flags  = IORESOURCE_MEM,
@@ -329,15 +311,12 @@ static struct platform_device tmu6_device = {
 };
 
 static struct sh_timer_config tmu7_platform_data = {
-        .name = "TMU7",
         .channel_offset = 0x10,
         .timer_bit = 1,
-        .clk = "peripheral_clk",
 };
 
 static struct resource tmu7_resources[] = {
         [0] = {
-                .name   = "TMU7",
                 .start  = 0xffdc0014,
                 .end    = 0xffdc001f,
                 .flags  = IORESOURCE_MEM,
@@ -359,15 +338,12 @@ static struct platform_device tmu7_device = {
 };
 
 static struct sh_timer_config tmu8_platform_data = {
-        .name = "TMU8",
         .channel_offset = 0x1c,
         .timer_bit = 2,
-        .clk = "peripheral_clk",
 };
 
 static struct resource tmu8_resources[] = {
         [0] = {
-                .name   = "TMU8",
                 .start  = 0xffdc0020,
                 .end    = 0xffdc002b,
                 .flags  = IORESOURCE_MEM,
@@ -389,15 +365,12 @@ static struct platform_device tmu8_device = {
 };
 
 static struct sh_timer_config tmu9_platform_data = {
-        .name = "TMU9",
         .channel_offset = 0x04,
         .timer_bit = 0,
-        .clk = "peripheral_clk",
 };
 
 static struct resource tmu9_resources[] = {
         [0] = {
-                .name   = "TMU9",
                 .start  = 0xffde0008,
                 .end    = 0xffde0013,
                 .flags  = IORESOURCE_MEM,
@@ -419,15 +392,12 @@ static struct platform_device tmu9_device = {
 };
 
 static struct sh_timer_config tmu10_platform_data = {
-        .name = "TMU10",
         .channel_offset = 0x10,
         .timer_bit = 1,
-        .clk = "peripheral_clk",
 };
 
 static struct resource tmu10_resources[] = {
         [0] = {
-                .name   = "TMU10",
                 .start  = 0xffde0014,
                 .end    = 0xffde001f,
                 .flags  = IORESOURCE_MEM,
@@ -449,15 +419,12 @@ static struct platform_device tmu10_device = {
 };
 
 static struct sh_timer_config tmu11_platform_data = {
-        .name = "TMU11",
         .channel_offset = 0x1c,
         .timer_bit = 2,
-        .clk = "peripheral_clk",
 };
 
 static struct resource tmu11_resources[] = {
         [0] = {
-                .name   = "TMU11",
                 .start  = 0xffde0020,
                 .end    = 0xffde002b,
                 .flags  = IORESOURCE_MEM,
@@ -478,6 +445,83 @@ static struct platform_device tmu11_device = {
         .num_resources  = ARRAY_SIZE(tmu11_resources),
 };
 
+static const struct sh_dmae_channel dmac0_channels[] = {
+        {
+                .offset = 0,
+                .dmars = 0,
+                .dmars_bit = 0,
+        }, {
+                .offset = 0x10,
+                .dmars = 0,
+                .dmars_bit = 8,
+        }, {
+                .offset = 0x20,
+                .dmars = 4,
+                .dmars_bit = 0,
+        }, {
+                .offset = 0x30,
+                .dmars = 4,
+                .dmars_bit = 8,
+        }, {
+                .offset = 0x50,
+                .dmars = 8,
+                .dmars_bit = 0,
+        }, {
+                .offset = 0x60,
+                .dmars = 8,
+                .dmars_bit = 8,
+        }
+};
+
+static const unsigned int ts_shift[] = TS_SHIFT;
+
+static struct sh_dmae_pdata dma0_platform_data = {
+        .channel        = dmac0_channels,
+        .channel_num    = ARRAY_SIZE(dmac0_channels),
+        .ts_low_shift   = CHCR_TS_LOW_SHIFT,
+        .ts_low_mask    = CHCR_TS_LOW_MASK,
+        .ts_high_shift  = CHCR_TS_HIGH_SHIFT,
+        .ts_high_mask   = CHCR_TS_HIGH_MASK,
+        .ts_shift       = ts_shift,
+        .ts_shift_num   = ARRAY_SIZE(ts_shift),
+        .dmaor_init     = DMAOR_INIT,
+};
+
+/* Resource order important! */
+static struct resource dmac0_resources[] = {
+        {
+                /* Channel registers and DMAOR */
+                .start  = 0xfe008020,
+                .end    = 0xfe00808f,
+                .flags  = IORESOURCE_MEM,
+        }, {
+                /* DMARSx */
+                .start  = 0xfe009000,
+                .end    = 0xfe00900b,
+                .flags  = IORESOURCE_MEM,
+        }, {
+                /* DMA error IRQ */
+                .start  = evt2irq(0x5c0),
+                .end    = evt2irq(0x5c0),
+                .flags  = IORESOURCE_IRQ,
+        }, {
+                /* IRQ for channels 0-5 */
+                .start  = evt2irq(0x500),
+                .end    = evt2irq(0x5a0),
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device dma0_device = {
+        .name           = "sh-dma-engine",
+        .id             = 0,
+        .resource       = dmac0_resources,
+        .num_resources  = ARRAY_SIZE(dmac0_resources),
+        .dev            = {
+                .platform_data  = &dma0_platform_data,
+        },
+};
+
 static struct resource usb_ohci_resources[] = {
         [0] = {
                 .start  = 0xffe70400,
@@ -525,10 +569,10 @@ static struct platform_device *sh7786_early_devices[] __initdata = {
 };
 
 static struct platform_device *sh7786_devices[] __initdata = {
+        &dma0_device,
         &usb_ohci_device,
 };
 
-
 /*
  * Please call this function if your platform board
  * use external clock for USB
@@ -536,6 +580,7 @@ static struct platform_device *sh7786_devices[] __initdata = {
 #define USBCTL0         0xffe70858
 #define CLOCK_MODE_MASK 0xffffff7f
 #define EXT_CLOCK_MODE  0x00000080
+
 void __init sh7786_usb_use_exclock(void)
 {
         u32 val = __raw_readl(USBCTL0) & CLOCK_MODE_MASK;
@@ -553,6 +598,7 @@ void __init sh7786_usb_use_exclock(void)
 #define PLL_ENB         0x00000002
 #define PHY_RST         0x00000004
 #define ACT_PLL_STATUS  0xc0000000
+
 static void __init sh7786_usb_setup(void)
 {
         int i = 1000000;
@@ -708,9 +754,19 @@ static struct intc_vect vectors[] __initdata = {
 #define INTMSK2         0xfe410068
 #define INTMSKCLR2      0xfe41006c
 
+#define INTDISTCR0      0xfe4100b0
+#define INTDISTCR1      0xfe4100b4
+#define INTACK          0xfe4100b8
+#define INTACKCLR       0xfe4100bc
+#define INT2DISTCR0     0xfe410900
+#define INT2DISTCR1     0xfe410904
+#define INT2DISTCR2     0xfe410908
+#define INT2DISTCR3     0xfe41090c
+
 static struct intc_mask_reg mask_registers[] __initdata = {
         { CnINTMSK0, CnINTMSKCLR0, 32,
-          { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },
+          { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 },
+            INTC_SMP_BALANCING(INTDISTCR0) },
         { INTMSK2, INTMSKCLR2, 32,
           { IRL0_LLLL, IRL0_LLLH, IRL0_LLHL, IRL0_LLHH,
             IRL0_LHLL, IRL0_LHLH, IRL0_LHHL, IRL0_LHHH,
@@ -722,7 +778,8 @@ static struct intc_mask_reg mask_registers[] __initdata = {
             IRL4_HHLL, IRL4_HHLH, IRL4_HHHL, 0, } },
         { CnINT2MSKR0, CnINT2MSKCR0 , 32,
           { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, WDT } },
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, WDT },
+            INTC_SMP_BALANCING(INT2DISTCR0) },
         { CnINT2MSKR1, CnINT2MSKCR1, 32,
           { TMU0_0, TMU0_1, TMU0_2, TMU0_3, TMU1_0, TMU1_1, TMU1_2, 0,
             DMAC0_0, DMAC0_1, DMAC0_2, DMAC0_3, DMAC0_4, DMAC0_5, DMAC0_6,
@@ -731,14 +788,14 @@ static struct intc_mask_reg mask_registers[] __initdata = {
             HPB_0, HPB_1, HPB_2,
             SCIF0_0, SCIF0_1, SCIF0_2, SCIF0_3,
             SCIF1,
-            TMU2, TMU3, 0, } },
+            TMU2, TMU3, 0, }, INTC_SMP_BALANCING(INT2DISTCR1) },
         { CnINT2MSKR2, CnINT2MSKCR2, 32,
           { 0, 0, SCIF2, SCIF3, SCIF4, SCIF5,
             Eth_0, Eth_1,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             PCIeC0_0, PCIeC0_1, PCIeC0_2,
             PCIeC1_0, PCIeC1_1, PCIeC1_2,
-            USB, 0, 0 } },
+            USB, 0, 0 }, INTC_SMP_BALANCING(INT2DISTCR2) },
         { CnINT2MSKR3, CnINT2MSKCR3, 32,
           { 0, 0, 0, 0, 0, 0,
             I2C0, I2C1,
@@ -747,7 +804,7 @@ static struct intc_mask_reg mask_registers[] __initdata = {
             HAC0, HAC1,
             FLCTL, 0,
             HSPI, GPIO0, GPIO1, Thermal,
-            0, 0, 0, 0, 0, 0, 0, 0 } },
+            0, 0, 0, 0, 0, 0, 0, 0 }, INTC_SMP_BALANCING(INT2DISTCR3) },
 };
 
 static struct intc_prio_reg prio_registers[] __initdata = {
@@ -863,6 +920,19 @@ static DECLARE_INTC_DESC(intc_desc_irl4567, "sh7786-irl4567", vectors_irl4567,
 #define INTC_INTMSK2    INTMSK2
 #define INTC_INTMSKCLR1 CnINTMSKCLR1
 #define INTC_INTMSKCLR2 INTMSKCLR2
+#define INTC_USERIMASK  0xfe411000
+
+#ifdef CONFIG_INTC_BALANCING
+unsigned int irq_lookup(unsigned int irq)
+{
+        return __raw_readl(INTACK) & 1 ? irq : NO_IRQ_IGNORE;
+}
+
+void irq_finish(unsigned int irq)
+{
+        __raw_writel(irq2evt(irq), INTACKCLR);
+}
+#endif
 
 void __init plat_irq_setup(void)
 {
@@ -877,6 +947,7 @@ void __init plat_irq_setup(void)
         __raw_writel(__raw_readl(INTC_ICR0) & ~0x00c00000, INTC_ICR0);
 
         register_intc_controller(&intc_desc);
+        register_intc_userimask(INTC_USERIMASK);
 }
 
 void __init plat_irq_setup_pins(int mode)