Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a0f4c78 authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

sh: sh7343 Enable SDIO IRQs 



This patch enables interrupt generation for SDIO IRQs
of the SDHI block on the sh7343 processor. Use together
with a recent SDHI driver using TMIO_MMC_SDIO_IRQ and
with the MMC_CAP_SDIO_IRQ flag in the board code.

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent e8a50ae3

arch/sh/kernel/cpu/sh4a/setup-sh7343.c

+14 −11
Original line number Diff line number Diff line
@@ -360,6 +360,8 @@ void __init plat_early_device_setup(void) 


enum {

	UNUSED = 0,

	ENABLED,

	DISABLED,



	/* interrupt sources */

	IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7,
@@ -375,15 +377,13 @@ enum { 
	I2C0_ALI, I2C0_TACKI, I2C0_WAITI, I2C0_DTEI,

	I2C1_ALI, I2C1_TACKI, I2C1_WAITI, I2C1_DTEI,

	SIM_TEI, SIM_TXI, SIM_RXI, SIM_ERI,

	IRDA,

	SDHI0, SDHI1, SDHI2, SDHI3,

	CMT, TSIF, SIU,

	IRDA, SDHI, CMT, TSIF, SIU,

	TMU0, TMU1, TMU2,

	JPU, LCDC,



	/* interrupt groups */



	DMAC0123, VIOVOU, MMC, DMAC45, FLCTL, I2C0, I2C1, SIM, SDHI, USB,

	DMAC0123, VIOVOU, MMC, DMAC45, FLCTL, I2C0, I2C1, SIM, USB,

};



static struct intc_vect vectors[] __initdata = {
@@ -412,8 +412,8 @@ static struct intc_vect vectors[] __initdata = { 
	INTC_VECT(FLCTL_FLTREQ0I, 0xdc0), INTC_VECT(FLCTL_FLTREQ1I, 0xde0),

	INTC_VECT(I2C0_ALI, 0xe00), INTC_VECT(I2C0_TACKI, 0xe20),

	INTC_VECT(I2C0_WAITI, 0xe40), INTC_VECT(I2C0_DTEI, 0xe60),

	INTC_VECT(SDHI0, 0xe80), INTC_VECT(SDHI1, 0xea0),

	INTC_VECT(SDHI2, 0xec0), INTC_VECT(SDHI3, 0xee0),

	INTC_VECT(SDHI, 0xe80), INTC_VECT(SDHI, 0xea0),

	INTC_VECT(SDHI, 0xec0), INTC_VECT(SDHI, 0xee0),

	INTC_VECT(CMT, 0xf00), INTC_VECT(TSIF, 0xf20),

	INTC_VECT(SIU, 0xf80),

	INTC_VECT(TMU0, 0x400), INTC_VECT(TMU1, 0x420),
@@ -431,7 +431,6 @@ static struct intc_group groups[] __initdata = { 
	INTC_GROUP(I2C0, I2C0_ALI, I2C0_TACKI, I2C0_WAITI, I2C0_DTEI),

	INTC_GROUP(I2C1, I2C1_ALI, I2C1_TACKI, I2C1_WAITI, I2C1_DTEI),

	INTC_GROUP(SIM, SIM_TEI, SIM_TXI, SIM_RXI, SIM_ERI),

	INTC_GROUP(SDHI, SDHI0, SDHI1, SDHI2, SDHI3),

	INTC_GROUP(USB, USBI0, USBI1),

};
@@ -452,7 +451,7 @@ static struct intc_mask_reg mask_registers[] __initdata = { 
	  { I2C0_DTEI, I2C0_WAITI, I2C0_TACKI, I2C0_ALI,

	    FLCTL_FLTREQ1I, FLCTL_FLTREQ0I, FLCTL_FLENDI, FLCTL_FLSTEI } },

	{ 0xa40800a0, 0xa40800e0, 8, /* IMR8 / IMCR8 */

	  { SDHI3, SDHI2, SDHI1, SDHI0, 0, 0, 0, SIU } },

	  { DISABLED, ENABLED, ENABLED, ENABLED, 0, 0, 0, SIU } },

	{ 0xa40800a4, 0xa40800e4, 8, /* IMR9 / IMCR9 */

	  { 0, 0, 0, CMT, 0, USBI1, USBI0 } },

	{ 0xa40800a8, 0xa40800e8, 8, /* IMR10 / IMCR10 */
@@ -488,9 +487,13 @@ static struct intc_mask_reg ack_registers[] __initdata = { 
	  { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } },

};



static DECLARE_INTC_DESC_ACK(intc_desc, "sh7343", vectors, groups,

			     mask_registers, prio_registers, sense_registers,

			     ack_registers);

static struct intc_desc intc_desc __initdata = {

	.name = "sh7343",

	.force_enable = ENABLED,

	.force_disable = DISABLED,

	.hw = INTC_HW_DESC(vectors, groups, mask_registers,

			   prio_registers, sense_registers, ack_registers),

};



void __init plat_irq_setup(void)

{