From patchwork Tue Dec 28 22:22:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Hannemann X-Patchwork-Id: 437501 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBSMOELC005901 for ; Tue, 28 Dec 2010 22:24:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751642Ab0L1WYQ (ORCPT ); Tue, 28 Dec 2010 17:24:16 -0500 Received: from slowhand.arndnet.de ([88.198.19.76]:52598 "EHLO mail.unitix.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752053Ab0L1WYN (ORCPT ); Tue, 28 Dec 2010 17:24:13 -0500 Received: from kallisto.arndnet.arn (p4FCB5F51.dip.t-dialin.net [79.203.95.81]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.unitix.de (Postfix) with ESMTP id 0C76713EA5; Tue, 28 Dec 2010 23:24:12 +0100 (CET) From: Arnd Hannemann To: linux-mmc@vger.kernel.org Cc: Magnus Damm , linux-sh@vger.kernel.org, g.liakhovetski@gmx.de, Ian Molton , Samuel Ortiz , Arnd Hannemann Subject: [PATCH 5/6 v3] sh: sh7722 Enable SDIO IRQs Date: Tue, 28 Dec 2010 23:22:35 +0100 Message-Id: <1293574956-30035-6-git-send-email-arnd@arndnet.de> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1293574956-30035-1-git-send-email-arnd@arndnet.de> References: <1293574956-30035-1-git-send-email-arnd@arndnet.de> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 28 Dec 2010 22:24:18 +0000 (UTC) diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c index 5dc72b4..affeec4 100644 --- a/arch/sh/boards/mach-migor/setup.c +++ b/arch/sh/boards/mach-migor/setup.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -413,6 +414,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 */