ARM: mach-shmobile: sh7367 SDHI vector merge
Magnus Damm
maintainerPATCH 1/1 ARM: mach-shmobile: sh7367 SDHI vector merge
From: Magnus Damm <[email protected]>
Merge the SDHI vectors for sh7367 using the recently merged INTC force_enable/disable feature.
With this in place SDHI hotplug is supported using the drivers sh_mobile_sdhi and tmio_mmc.
Signed-off-by Magnus Damm <[email protected]>
---
Depends on INTC patches available in 2.6.34-rc1
arch/arm/mach-shmobile/intc-sh7367.c | 46 +++++++++++++++++----------------- 1 file changed, 23 insertions(+), 23 deletions(-)
arch/arm/mach-shmobile/intc-sh7367.c +23 -23
@@ -27,6 +27,8 @@enum {UNUSED_INTCA =0 , +ENABLED , +DISABLED ,/* interrupt sources INTCA */ IRQ0A ,IRQ1A ,IRQ2A ,IRQ3A ,IRQ4A ,IRQ5A ,IRQ6A ,IRQ7A ,
@@ -46,8 +48,8 @@ enum {MSIOF2 ,MSIOF1 ,SCIFA4 ,SCIFA5 ,SCIFB ,FLCTL_FLSTEI ,FLCTL_FLTENDI ,FLCTL_FLTREQ0I ,FLCTL_FLTREQ1I , -SDHI0_SDHI0I0 ,SDHI0_SDHI0I1 ,SDHI0_SDHI0I2 ,SDHI0_SDHI0I3 , -SDHI1_SDHI1I0 ,SDHI1_SDHI1I1 ,SDHI1_SDHI1I2 ,SDHI1_SDHI1I3 , +SDHI0 , +SDHI1 ,MSU_MSU ,MSU_MSU2 ,IREM , SIU,
@@ -59,7 +61,7 @@ enum {TTI20 ,MISTY ,DDM , -SDHI2_SDHI2I0 ,SDHI2_SDHI2I1 ,SDHI2_SDHI2I2 ,SDHI2_SDHI2I3 , +SDHI2 ,RWDT0 ,RWDT1 ,DMAC_1_DEI0 ,DMAC_1_DEI1 ,DMAC_1_DEI2 ,DMAC_1_DEI3 , DMAC_2_DEI4, DMAC_2_DEI5, DMAC_2_DADERR,
@@ -70,7 +72,7 @@ enum {/* interrupt groups INTCA */ DMAC_1 ,DMAC_2 ,DMAC2_1 ,DMAC2_2 ,DMAC3_1 ,DMAC3_2 , - ETM11, ARM11, USBHS, FLCTL, IIC1, SDHI0, SDHI1, SDHI2, +ETM11 ,ARM11 ,USBHS ,FLCTL ,IIC1 }; static struct intc_vect intca_vectors[] = {
@@ -105,10 +107,10 @@ static struct intc_vect intca_vectors[]INTC_VECT (SCIFB ,0x0d60 ),INTC_VECT (FLCTL_FLSTEI ,0x0d80 ),INTC_VECT (FLCTL_FLTENDI ,0x0da0 ),INTC_VECT (FLCTL_FLTREQ0I ,0x0dc0 ),INTC_VECT (FLCTL_FLTREQ1I ,0x0de0 ), -INTC_VECT (SDHI0_SDHI0I0 ,0x0e00 ),INTC_VECT (SDHI0_SDHI0I1 ,0x0e20 ), -INTC_VECT (SDHI0_SDHI0I2 ,0x0e40 ),INTC_VECT (SDHI0_SDHI0I3 ,0x0e60 ), -INTC_VECT (SDHI1_SDHI1I0 ,0x0e80 ),INTC_VECT (SDHI1_SDHI1I1 ,0x0ea0 ), -INTC_VECT (SDHI1_SDHI1I2 ,0x0ec0 ),INTC_VECT (SDHI1_SDHI1I3 ,0x0ee0 ), +INTC_VECT (SDHI0 ,0x0e00 ),INTC_VECT (SDHI0 ,0x0e20 ), +INTC_VECT (SDHI0 ,0x0e40 ),INTC_VECT (SDHI0 ,0x0e60 ), +INTC_VECT (SDHI1 ,0x0e80 ),INTC_VECT (SDHI1 ,0x0ea0 ), +INTC_VECT (SDHI1 ,0x0ec0 ),INTC_VECT (SDHI1 ,0x0ee0 ),INTC_VECT (MSU_MSU ,0x0f20 ),INTC_VECT (MSU_MSU2 ,0x0f40 ),INTC_VECT (IREM ,0x0f60 ), INTC_VECT(SIU, 0x0fa0),
@@ -122,8 +124,8 @@ static struct intc_vect intca_vectors[]INTC_VECT (TTI20 ,0x1100 ),INTC_VECT (MISTY ,0x1120 ),INTC_VECT (DDM ,0x1140 ), -INTC_VECT (SDHI2_SDHI2I0 ,0x1200 ),INTC_VECT (SDHI2_SDHI2I1 ,0x1220 ), -INTC_VECT (SDHI2_SDHI2I2 ,0x1240 ),INTC_VECT (SDHI2_SDHI2I3 ,0x1260 ), +INTC_VECT (SDHI2 ,0x1200 ),INTC_VECT (SDHI2 ,0x1220 ), +INTC_VECT (SDHI2 ,0x1240 ),INTC_VECT (SDHI2 ,0x1260 ),INTC_VECT (RWDT0 ,0x1280 ),INTC_VECT (RWDT1 ,0x12a0 ),INTC_VECT (DMAC_1_DEI0 ,0x2000 ),INTC_VECT (DMAC_1_DEI1 ,0x2020 ), INTC_VECT(DMAC_1_DEI2, 0x2040), INTC_VECT(DMAC_1_DEI3, 0x2060),
@@ -158,12 +160,6 @@ static struct intc_group intca_groups[]INTC_GROUP (FLCTL ,FLCTL_FLSTEI ,FLCTL_FLTENDI ,FLCTL_FLTREQ0I ,FLCTL_FLTREQ1I ), INTC_GROUP(IIC1, IIC1_ALI1, IIC1_TACKI1, IIC1_WAITI1, IIC1_DTEI1), -INTC_GROUP (SDHI0 ,SDHI0_SDHI0I0 ,SDHI0_SDHI0I1 , -SDHI0_SDHI0I2 ,SDHI0_SDHI0I3 ), -INTC_GROUP (SDHI1 ,SDHI1_SDHI1I0 ,SDHI1_SDHI1I1 , -SDHI1_SDHI1I2 ,SDHI1_SDHI1I3 ), -INTC_GROUP (SDHI2 ,SDHI2_SDHI2I0 ,SDHI2_SDHI2I1 , - SDHI2_SDHI2I2, SDHI2_SDHI2I3), }; static struct intc_mask_reg intca_mask_registers[] = {
@@ -193,10 +189,10 @@ static struct intc_mask_reg intca_mask_r {SCIFB ,SCIFA5 ,SCIFA4 ,MSIOF1 , 0, 0, MSIOF2, 0 } }, {0xe694009c ,0xe69400dc ,8 ,/* IMR7A / IMCR7A */ - { SDHI0_SDHI0I3, SDHI0_SDHI0I2, SDHI0_SDHI0I1, SDHI0_SDHI0I0, + { DISABLED, DISABLED, ENABLED, ENABLED, FLCTL_FLTREQ1I, FLCTL_FLTREQ0I, FLCTL_FLTENDI, FLCTL_FLSTEI } }, { 0xe69400a0, 0xe69400e0, 8, /* IMR8A / IMCR8A */ - { SDHI1_SDHI1I3, SDHI1_SDHI1I2, SDHI1_SDHI1I1, SDHI1_SDHI1I0, + { DISABLED, DISABLED, ENABLED, ENABLED, TTI20, USBDMAC_USHDMI, SPU, SIU } }, { 0xe69400a4, 0xe69400e4, 8, /* IMR9A / IMCR9A */ { CMT1_CMT13, CMT1_CMT12, CMT1_CMT11, CMT1_CMT10,
@@ -211,7 +207,7 @@ static struct intc_mask_reg intca_mask_r {0 ,0 ,TPU0 ,TPU1 , TPU2, TPU3, TPU4, 0 } }, { 0xe69400b4, 0xe69400f4, 8, /* IMR13A / IMCR13A */ - { SDHI2_SDHI2I3, SDHI2_SDHI2I2, SDHI2_SDHI2I1, SDHI2_SDHI2I0, + { DISABLED, DISABLED, ENABLED, ENABLED, MISTY, CMT3, RWDT1, RWDT0 } }, };
@@ -258,10 +254,14 @@ static struct intc_mask_reg intca_ack_re { IRQ8A, IRQ9A, IRQ10A, IRQ11A, IRQ12A, IRQ13A, IRQ14A, IRQ15A } }, }; -static DECLARE_INTC_DESC_ACK(intca_desc, "sh7367-intca", - intca_vectors, intca_groups, - intca_mask_registers, intca_prio_registers, - intca_sense_registers, intca_ack_registers); +static struct intc_desc intca_desc__initdata = { + .name ="sh7367-intca" , + .force_enable =ENABLED , + .force_disable =DISABLED , + .hw =INTC_HW_DESC (intca_vectors, intca_groups, + intca_mask_registers, intca_prio_registers, + intca_sense_registers, intca_ack_registers), +};void __init sh7367_init_irq (void ) {