sh: sh7723/AP325 SDHI vector merge

Merge the SDHI vectors in the sh7723 INTC table
and update the SDHI platform data for AP325.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
index 27277cbdb636945c9898cb62b39f48db0205b925..b5980696abbe1da6ec44c493be52a6ed2cfcc0e3 100644 (file)
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/mach-ap325rxa/setup.c
@@ -420,7 +420,7 @@ static struct resource sdhi0_cn3_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 101,
+               .start  = 100,
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -443,7 +443,7 @@ static struct resource sdhi1_cn7_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = 24,
+               .start  = 23,
                .flags  = IORESOURCE_IRQ,
        },
 };

diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
index 9e8620e3ad3e28ca38ec963cb7de8001402b9852..7b90ebcfa20edb372de37592cf729485ac3a290c 100644 (file)
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
@@ -601,6 +601,7 @@ void l2_cache_init(void)
 
 enum {
        UNUSED=0,
+       ENABLED,
 
        /* interrupt sources */
        IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7,
@@ -623,7 +624,6 @@ enum {
        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,
@@ -631,7 +631,6 @@ enum {
        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,
@@ -702,9 +701,9 @@ static struct intc_vect vectors[] __initdata = {
        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(SDHI0, 0xE80),
+       INTC_VECT(SDHI0, 0xEA0),
+       INTC_VECT(SDHI0, 0xEC0),
 
        INTC_VECT(CMT_CMTI,0xF00),
        INTC_VECT(TSIF_TSIFI,0xF20),
@@ -718,9 +717,9 @@ static struct intc_vect vectors[] __initdata = {
        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(SDHI1, 0x4E0),
+       INTC_VECT(SDHI1, 0x500),
+       INTC_VECT(SDHI1, 0x520),
 
        INTC_VECT(VEU2H1_VEU2HI,0x560),
        INTC_VECT(LCDC_LCDCI,0x580),
@@ -739,15 +738,14 @@ static struct intc_group groups[] __initdata = {
        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} },
+         { 0, TMU1_TUNI2, TMU1_TUNI1, TMU1_TUNI0,
+           0, 0, ENABLED, ENABLED } },
        { 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 */
@@ -764,7 +762,8 @@ static struct intc_mask_reg mask_registers[] __initdata = {
          { 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 } },
+         { 0, 0, ENABLED, ENABLED,
+           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 */
@@ -804,9 +803,12 @@ static struct intc_mask_reg ack_registers[] __initdata = {
          { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },
 };
 
-static DECLARE_INTC_DESC_ACK(intc_desc, "sh7723", vectors, groups,
-                            mask_registers, prio_registers, sense_registers,
-                            ack_registers);
+static struct intc_desc intc_desc __initdata = {
+       .name = "sh7723",
+       .force_enable = ENABLED,
+       .hw = INTC_HW_DESC(vectors, groups, mask_registers,
+                          prio_registers, sense_registers, ack_registers),
+};
 
 void __init plat_irq_setup(void)
 {