From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Hannemann Date: Mon, 06 Dec 2010 17:35:42 +0000 Subject: [PATCH 4/4] [RFC] sh: sh7722 Enable SDIO IRQs Message-Id: <1291656942-18100-4-git-send-email-arnd@arndnet.de> List-Id: References: <1291656942-18100-1-git-send-email-arnd@arndnet.de> In-Reply-To: <1291656942-18100-1-git-send-email-arnd@arndnet.de> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-mmc@vger.kernel.org Cc: linux-sh@vger.kernel.org, g.liakhovetski@gmx.de, Arnd Hannemann 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 migor. Untested, therefore RFC. Signed-off-by: Arnd Hannemann --- arch/sh/boards/mach-migor/setup.c | 1 + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c index 5dc72b4..b9cba53 100644 --- a/arch/sh/boards/mach-migor/setup.c +++ b/arch/sh/boards/mach-migor/setup.c @@ -413,6 +413,7 @@ static struct resource sdhi_cn9_resources[] = { static struct sh_mobile_sdhi_info sh7724_sdhi_data = { .dma_slave_tx = SHDMA_SLAVE_SDHI0_TX, .dma_slave_rx = SHDMA_SLAVE_SDHI0_RX, + .tmio_caps = MMC_CAP_SDIO_IRQ, }; static struct platform_device sdhi_cn9_device = { diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c index d551ed8..a164f89 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c @@ -699,7 +699,7 @@ static struct intc_mask_reg mask_registers[] __initdata = { { I2C_DTEI, I2C_WAITI, I2C_TACKI, I2C_ALI, FLCTL_FLTREQ1I, FLCTL_FLTREQ0I, FLCTL_FLENDI, FLCTL_FLSTEI } }, { 0xa40800a0, 0xa40800e0, 8, /* IMR8 / IMCR8 */ - { DISABLED, DISABLED, ENABLED, ENABLED, 0, 0, TWODG, SIU } }, + { DISABLED, ENABLED, ENABLED, ENABLED, 0, 0, TWODG, SIU } }, { 0xa40800a4, 0xa40800e4, 8, /* IMR9 / IMCR9 */ { 0, 0, 0, CMT, 0, USB_USBI1, USB_USBI0, } }, { 0xa40800a8, 0xa40800e8, 8, /* IMR10 / IMCR10 */ -- 1.7.0.4