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

Commit cb2ccc32 authored by Simon Horman's avatar Simon Horman Committed by Chris Ball
Browse files

ARM: shmobile: ag5evm, ap4: Named SDHI IRQ sources 



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: default avatarMagnus Damm <magnus.damm@gmail.com>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent d5098cb6

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

+6 −0
Original line number Diff line number Diff line
@@ -354,14 +354,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,

	},
@@ -397,14 +400,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,

	},

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

+6 −0
Original line number Diff line number Diff line
@@ -1070,14 +1070,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,

	},
@@ -1121,14 +1124,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,

	},