diff mbox

[v8,4/4] ARM: shmobile: ag5evm, ap4: Named SDHI IRQ sources

Message ID 1314235648-8959-5-git-send-email-horms@verge.net.au (mailing list archive)
State Accepted
Headers show

Commit Message

Simon Horman Aug. 25, 2011, 1:27 a.m. UTC 
This allows specific (non-multiplexed) IRQ handlers to be used.

Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Paul Mundt <lethal@linux-sh.org>
Acked-by: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>

---

Requires
"mmc: sdhi: Allow specific IRQ sources to use corresponding handlers."

v7
* Rework to use named IRQs

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   |    6 ++++++
 arch/arm/mach-shmobile/board-mackerel.c |    6 ++++++
 2 files changed, 12 insertions(+), 0 deletions(-)

Comments

Guennadi Liakhovetski Aug. 26, 2011, 8:44 a.m. UTC | #1 
On Thu, 25 Aug 2011, Simon Horman wrote:

> This allows specific (non-multiplexed) IRQ handlers to be used.

Could you also prepare a similar patch for g4evm and ap4evb? No need to 
change this one, just prepare another one, please.

Thanks
Guennadi

> 
> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> Cc: Paul Mundt <lethal@linux-sh.org>
> Acked-by: Magnus Damm <magnus.damm@gmail.com>
> Signed-off-by: Simon Horman <horms@verge.net.au>
> 
> ---
> 
> Requires
> "mmc: sdhi: Allow specific IRQ sources to use corresponding handlers."
> 
> v7
> * Rework to use named IRQs
> 
> 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   |    6 ++++++
>  arch/arm/mach-shmobile/board-mackerel.c |    6 ++++++
>  2 files changed, 12 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c
> index ce5c251..e100cad 100644
> --- a/arch/arm/mach-shmobile/board-ag5evm.c
> +++ b/arch/arm/mach-shmobile/board-ag5evm.c
> @@ -353,14 +353,17 @@ static struct resource sdhi0_resources[] = {
>  		.flags	= IORESOURCE_MEM,
>  	},
>  	[1] = {
> +		.name	= SH_MOBILE_SDHI_IRQ_CARD_DETECT,
>  		.start	= gic_spi(83),
>  		.flags	= IORESOURCE_IRQ,
>  	},
>  	[2] = {
> +		.name	= SH_MOBILE_SDHI_IRQ_SDCARD,
>  		.start	= gic_spi(84),
>  		.flags	= IORESOURCE_IRQ,
>  	},
>  	[3] = {
> +		.name	= SH_MOBILE_SDHI_IRQ_SDIO,
>  		.start	= gic_spi(85),
>  		.flags	= IORESOURCE_IRQ,
>  	},
> @@ -396,14 +399,17 @@ static struct resource sdhi1_resources[] = {
>  		.flags	= IORESOURCE_MEM,
>  	},
>  	[1] = {
> +		.name	= SH_MOBILE_SDHI_IRQ_CARD_DETECT,
>  		.start	= gic_spi(87),
>  		.flags	= IORESOURCE_IRQ,
>  	},
>  	[2] = {
> +		.name	= SH_MOBILE_SDHI_IRQ_SDCARD,
>  		.start	= gic_spi(88),
>  		.flags	= IORESOURCE_IRQ,
>  	},
>  	[3] = {
> +		.name	= 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..492274f 100644
> --- a/arch/arm/mach-shmobile/board-mackerel.c
> +++ b/arch/arm/mach-shmobile/board-mackerel.c
> @@ -1066,14 +1066,17 @@ static struct resource sdhi1_resources[] = {
>  		.flags	= IORESOURCE_MEM,
>  	},
>  	[1] = {
> +		.name	= SH_MOBILE_SDHI_IRQ_CARD_DETECT,
>  		.start	= evt2irq(0x0e80), /* SDHI1_SDHI1I0 */
>  		.flags	= IORESOURCE_IRQ,
>  	},
>  	[2] = {
> +		.name	= SH_MOBILE_SDHI_IRQ_SDCARD,
>  		.start	= evt2irq(0x0ea0), /* SDHI1_SDHI1I1 */
>  		.flags	= IORESOURCE_IRQ,
>  	},
>  	[3] = {
> +		.name	= SH_MOBILE_SDHI_IRQ_SDIO,
>  		.start	= evt2irq(0x0ec0), /* SDHI1_SDHI1I2 */
>  		.flags	= IORESOURCE_IRQ,
>  	},
> @@ -1117,14 +1120,17 @@ static struct resource sdhi2_resources[] = {
>  		.flags	= IORESOURCE_MEM,
>  	},
>  	[1] = {
> +		.name	= SH_MOBILE_SDHI_IRQ_CARD_DETECT,
>  		.start	= evt2irq(0x1200), /* SDHI2_SDHI2I0 */
>  		.flags	= IORESOURCE_IRQ,
>  	},
>  	[2] = {
> +		.name	= SH_MOBILE_SDHI_IRQ_SDCARD,
>  		.start	= evt2irq(0x1220), /* SDHI2_SDHI2I1 */
>  		.flags	= IORESOURCE_IRQ,
>  	},
>  	[3] = {
> +		.name	= SH_MOBILE_SDHI_IRQ_SDIO,
>  		.start	= evt2irq(0x1240), /* SDHI2_SDHI2I2 */
>  		.flags	= IORESOURCE_IRQ,
>  	},
> -- 
> 1.7.5.4
> 

---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Simon Horman Aug. 26, 2011, 9:14 a.m. UTC | #2 
On Fri, Aug 26, 2011 at 10:44:16AM +0200, Guennadi Liakhovetski wrote:
> On Thu, 25 Aug 2011, Simon Horman wrote:
> 
> > This allows specific (non-multiplexed) IRQ handlers to be used.
> 
> Could you also prepare a similar patch for g4evm and ap4evb? No need to 
> change this one, just prepare another one, please.

Sure, though I do not have access to those boards to test
(as far as I know).

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Guennadi Liakhovetski Aug. 26, 2011, 9:22 a.m. UTC | #3 
On Fri, 26 Aug 2011, Simon Horman wrote:

> On Fri, Aug 26, 2011 at 10:44:16AM +0200, Guennadi Liakhovetski wrote:
> > On Thu, 25 Aug 2011, Simon Horman wrote:
> > 
> > > This allows specific (non-multiplexed) IRQ handlers to be used.
> > 
> > Could you also prepare a similar patch for g4evm and ap4evb? No need to 
> > change this one, just prepare another one, please.
> 
> Sure, though I do not have access to those boards to test
> (as far as I know).

Ok, I've got an ap4evb, so, I'll prepare that patch myself.

Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c
index ce5c251..e100cad 100644
--- a/arch/arm/mach-shmobile/board-ag5evm.c
+++ b/arch/arm/mach-shmobile/board-ag5evm.c
@@ -353,14 +353,17 @@  static struct resource sdhi0_resources[] = {
 		.flags	= IORESOURCE_MEM,
 	},
 	[1] = {
+		.name	= SH_MOBILE_SDHI_IRQ_CARD_DETECT,
 		.start	= gic_spi(83),
 		.flags	= IORESOURCE_IRQ,
 	},
 	[2] = {
+		.name	= SH_MOBILE_SDHI_IRQ_SDCARD,
 		.start	= gic_spi(84),
 		.flags	= IORESOURCE_IRQ,
 	},
 	[3] = {
+		.name	= SH_MOBILE_SDHI_IRQ_SDIO,
 		.start	= gic_spi(85),
 		.flags	= IORESOURCE_IRQ,
 	},
@@ -396,14 +399,17 @@  static struct resource sdhi1_resources[] = {
 		.flags	= IORESOURCE_MEM,
 	},
 	[1] = {
+		.name	= SH_MOBILE_SDHI_IRQ_CARD_DETECT,
 		.start	= gic_spi(87),
 		.flags	= IORESOURCE_IRQ,
 	},
 	[2] = {
+		.name	= SH_MOBILE_SDHI_IRQ_SDCARD,
 		.start	= gic_spi(88),
 		.flags	= IORESOURCE_IRQ,
 	},
 	[3] = {
+		.name	= 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..492274f 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -1066,14 +1066,17 @@  static struct resource sdhi1_resources[] = {
 		.flags	= IORESOURCE_MEM,
 	},
 	[1] = {
+		.name	= SH_MOBILE_SDHI_IRQ_CARD_DETECT,
 		.start	= evt2irq(0x0e80), /* SDHI1_SDHI1I0 */
 		.flags	= IORESOURCE_IRQ,
 	},
 	[2] = {
+		.name	= SH_MOBILE_SDHI_IRQ_SDCARD,
 		.start	= evt2irq(0x0ea0), /* SDHI1_SDHI1I1 */
 		.flags	= IORESOURCE_IRQ,
 	},
 	[3] = {
+		.name	= SH_MOBILE_SDHI_IRQ_SDIO,
 		.start	= evt2irq(0x0ec0), /* SDHI1_SDHI1I2 */
 		.flags	= IORESOURCE_IRQ,
 	},
@@ -1117,14 +1120,17 @@  static struct resource sdhi2_resources[] = {
 		.flags	= IORESOURCE_MEM,
 	},
 	[1] = {
+		.name	= SH_MOBILE_SDHI_IRQ_CARD_DETECT,
 		.start	= evt2irq(0x1200), /* SDHI2_SDHI2I0 */
 		.flags	= IORESOURCE_IRQ,
 	},
 	[2] = {
+		.name	= SH_MOBILE_SDHI_IRQ_SDCARD,
 		.start	= evt2irq(0x1220), /* SDHI2_SDHI2I1 */
 		.flags	= IORESOURCE_IRQ,
 	},
 	[3] = {
+		.name	= SH_MOBILE_SDHI_IRQ_SDIO,
 		.start	= evt2irq(0x1240), /* SDHI2_SDHI2I2 */
 		.flags	= IORESOURCE_IRQ,
 	},