From patchwork Wed Aug 17 10:59:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1073562 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7HAxVEL026088 for ; Wed, 17 Aug 2011 10:59:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752943Ab1HQK7c (ORCPT ); Wed, 17 Aug 2011 06:59:32 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:42790 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753189Ab1HQK73 (ORCPT ); Wed, 17 Aug 2011 06:59:29 -0400 Received: from joe.akashicho.tokyo.vergenet.net (joe.akashicho.tokyo.vergenet.net [IPv6:2001:470:f44f:403:1ec1:deff:fe98:754d]) by kirsty.vergenet.net (Postfix) with ESMTP id CD803245AA; Wed, 17 Aug 2011 20:59:26 +1000 (EST) Received: by joe.akashicho.tokyo.vergenet.net (Postfix, from userid 7100) id 581D028A038; Wed, 17 Aug 2011 19:59:24 +0900 (JST) From: Simon Horman To: linux-mmc@vger.kernel.org, linux-sh@vger.kernel.org Cc: Chris Ball , Guennadi Liakhovetski , Magnus Damm , Paul Mundt , Simon Horman Subject: [PATCH 4/4] ARM: shmobile: ag5evm, ap4: Make use of irq index enum Date: Wed, 17 Aug 2011 19:59:16 +0900 Message-Id: <1313578756-10413-5-git-send-email-horms@verge.net.au> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1313578756-10413-1-git-send-email-horms@verge.net.au> References: <1313578756-10413-1-git-send-email-horms@verge.net.au> 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.6 (demeter2.kernel.org [140.211.167.43]); Wed, 17 Aug 2011 10:59:33 +0000 (UTC) This is intended to make it easier to correctly order IRQs. As suggested by Guennadi Liakhovetski. Cc: Guennadi Liakhovetski Cc: Magnus Damm Cc: Paul Mundt Signed-off-by: Simon Horman --- Depends on "mmc: sdhi: Make use of per-source irq handlers" v4 * Update for corrected ordering of SH_MOBILE_SDHI_IRQ_SDCARD and SH_MOBILE_SDHI_IRQ_CARD_DETECT v2 * Initial release --- arch/arm/mach-shmobile/board-ag5evm.c | 12 ++++++------ arch/arm/mach-shmobile/board-mackerel.c | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c index ce5c251..0d543bb 100644 --- a/arch/arm/mach-shmobile/board-ag5evm.c +++ b/arch/arm/mach-shmobile/board-ag5evm.c @@ -352,15 +352,15 @@ static struct resource sdhi0_resources[] = { .end = 0xee1000ff, .flags = IORESOURCE_MEM, }, - [1] = { + [1 + SH_MOBILE_SDHI_IRQ_CARD_DETECT] = { .start = gic_spi(83), .flags = IORESOURCE_IRQ, }, - [2] = { + [1 + SH_MOBILE_SDHI_IRQ_SDCARD] = { .start = gic_spi(84), .flags = IORESOURCE_IRQ, }, - [3] = { + [1 + SH_MOBILE_SDHI_IRQ_SDIO] = { .start = gic_spi(85), .flags = IORESOURCE_IRQ, }, @@ -395,15 +395,15 @@ static struct resource sdhi1_resources[] = { .end = 0xee1200ff, .flags = IORESOURCE_MEM, }, - [1] = { + [1 + SH_MOBILE_SDHI_IRQ_CARD_DETECT] = { .start = gic_spi(87), .flags = IORESOURCE_IRQ, }, - [2] = { + [1 + SH_MOBILE_SDHI_IRQ_SDCARD] = { .start = gic_spi(88), .flags = IORESOURCE_IRQ, }, - [3] = { + [1 + SH_MOBILE_SDHI_IRQ_SDIO] = { .start = gic_spi(89), .flags = IORESOURCE_IRQ, }, diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index d41c01f..f9d3a93 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -1022,15 +1022,15 @@ static struct resource sdhi0_resources[] = { .end = 0xe68500ff, .flags = IORESOURCE_MEM, }, - [1] = { + [1 + SH_MOBILE_SDHI_IRQ_CARD_DETECT] = { .start = evt2irq(0x0e00) /* SDHI0_SDHI0I0 */, .flags = IORESOURCE_IRQ, }, - [2] = { + [1 + SH_MOBILE_SDHI_IRQ_SDCARD] = { .start = evt2irq(0x0e20) /* SDHI0_SDHI0I1 */, .flags = IORESOURCE_IRQ, }, - [3] = { + [1 + SH_MOBILE_SDHI_IRQ_SDIO] = { .start = evt2irq(0x0e40) /* SDHI0_SDHI0I2 */, .flags = IORESOURCE_IRQ, }, @@ -1065,15 +1065,15 @@ static struct resource sdhi1_resources[] = { .end = 0xe68600ff, .flags = IORESOURCE_MEM, }, - [1] = { + [1 + SH_MOBILE_SDHI_IRQ_CARD_DETECT] = { .start = evt2irq(0x0e80), /* SDHI1_SDHI1I0 */ .flags = IORESOURCE_IRQ, }, - [2] = { + [1 + SH_MOBILE_SDHI_IRQ_SDCARD] = { .start = evt2irq(0x0ea0), /* SDHI1_SDHI1I1 */ .flags = IORESOURCE_IRQ, }, - [3] = { + [1 + SH_MOBILE_SDHI_IRQ_SDIO] = { .start = evt2irq(0x0ec0), /* SDHI1_SDHI1I2 */ .flags = IORESOURCE_IRQ, }, @@ -1116,15 +1116,15 @@ static struct resource sdhi2_resources[] = { .end = 0xe68700ff, .flags = IORESOURCE_MEM, }, - [1] = { + [1 + SH_MOBILE_SDHI_IRQ_CARD_DETECT] = { .start = evt2irq(0x1200), /* SDHI2_SDHI2I0 */ .flags = IORESOURCE_IRQ, }, - [2] = { + [1 + SH_MOBILE_SDHI_IRQ_SDCARD] = { .start = evt2irq(0x1220), /* SDHI2_SDHI2I1 */ .flags = IORESOURCE_IRQ, }, - [3] = { + [1 + SH_MOBILE_SDHI_IRQ_SDIO] = { .start = evt2irq(0x1240), /* SDHI2_SDHI2I2 */ .flags = IORESOURCE_IRQ, },