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

Commit 330e4e71 authored by Arnd Hannemann's avatar Arnd Hannemann Committed by Paul Mundt
Browse files

ARM: mach-shmobile: sh7372 Enable SDIO IRQs 



This patch enables the interrupt generation for SDIO IRQs
of the sdhi controllers of the SoC. To make sure interrupts
are handled announce the MMC_CAP_SDIO_IRQ capability
on AP4EVB. Tested with a b43-based SDIO wireless card.

Signed-off-by: default avatarArnd Hannemann <arnd@arndnet.de>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 4162cf64

arch/arm/mach-shmobile/board-ap4evb.c

+2 −1
Original line number Diff line number Diff line
@@ -308,6 +308,7 @@ static struct platform_device sh_mmcif_device = { 
static struct sh_mobile_sdhi_info sdhi0_info = {

	.dma_slave_tx	= SHDMA_SLAVE_SDHI0_TX,

	.dma_slave_rx	= SHDMA_SLAVE_SDHI0_RX,

	.tmio_caps	= MMC_CAP_SDIO_IRQ,

};



static struct resource sdhi0_resources[] = {
@@ -339,7 +340,7 @@ static struct sh_mobile_sdhi_info sdhi1_info = { 
	.dma_slave_rx	= SHDMA_SLAVE_SDHI1_RX,

	.tmio_ocr_mask	= MMC_VDD_165_195,

	.tmio_flags	= TMIO_MMC_WRPROTECT_DISABLE,

	.tmio_caps	= MMC_CAP_NEEDS_POLL,

	.tmio_caps	= MMC_CAP_NEEDS_POLL | MMC_CAP_SDIO_IRQ,

	.get_cd		= slot_cn7_get_cd,

};

arch/arm/mach-shmobile/intc-sh7372.c

+2 −2
Original line number Diff line number Diff line
@@ -230,10 +230,10 @@ static struct intc_mask_reg intca_mask_registers[] __initdata = { 
	  { SCIFB, SCIFA5, SCIFA4, MSIOF1,

	    0, 0, MSIOF2, 0 } },

	{ 0xe694009c, 0xe69400dc, 8, /* IMR7A / IMCR7A */

	  { DISABLED, DISABLED, ENABLED, ENABLED,

	  { DISABLED, ENABLED, ENABLED, ENABLED,

	    FLCTL_FLTREQ1I, FLCTL_FLTREQ0I, FLCTL_FLTENDI, FLCTL_FLSTEI } },

	{ 0xe69400a0, 0xe69400e0, 8, /* IMR8A / IMCR8A */

	  { 0, DISABLED, ENABLED, ENABLED,

	  { 0, ENABLED, ENABLED, ENABLED,

	    TTI20, USBHSDMAC0_USHDMI, 0, 0 } },

	{ 0xe69400a4, 0xe69400e4, 8, /* IMR9A / IMCR9A */

	  { CMT1_CMT13, CMT1_CMT12, CMT1_CMT11, CMT1_CMT10,