diff options
author | Simon Horman <horms@verge.net.au> | 2011-08-24 21:27:28 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2011-10-26 15:43:36 -0400 |
commit | cb2ccc32208cb91edf7363c0809ca9e42c4e04ed (patch) | |
tree | 5dda9b9353ff3289ae23e9ca7867a21265af23e6 /arch | |
parent | d5098cb63b3f13da2a2b230b3566ac7b5dfa4f28 (diff) |
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: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-shmobile/board-ag5evm.c | 6 | ||||
-rw-r--r-- | 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 cdfdd624d21..7719d184e59 100644 --- a/arch/arm/mach-shmobile/board-ag5evm.c +++ b/arch/arm/mach-shmobile/board-ag5evm.c | |||
@@ -354,14 +354,17 @@ static struct resource sdhi0_resources[] = { | |||
354 | .flags = IORESOURCE_MEM, | 354 | .flags = IORESOURCE_MEM, |
355 | }, | 355 | }, |
356 | [1] = { | 356 | [1] = { |
357 | .name = SH_MOBILE_SDHI_IRQ_CARD_DETECT, | ||
357 | .start = gic_spi(83), | 358 | .start = gic_spi(83), |
358 | .flags = IORESOURCE_IRQ, | 359 | .flags = IORESOURCE_IRQ, |
359 | }, | 360 | }, |
360 | [2] = { | 361 | [2] = { |
362 | .name = SH_MOBILE_SDHI_IRQ_SDCARD, | ||
361 | .start = gic_spi(84), | 363 | .start = gic_spi(84), |
362 | .flags = IORESOURCE_IRQ, | 364 | .flags = IORESOURCE_IRQ, |
363 | }, | 365 | }, |
364 | [3] = { | 366 | [3] = { |
367 | .name = SH_MOBILE_SDHI_IRQ_SDIO, | ||
365 | .start = gic_spi(85), | 368 | .start = gic_spi(85), |
366 | .flags = IORESOURCE_IRQ, | 369 | .flags = IORESOURCE_IRQ, |
367 | }, | 370 | }, |
@@ -397,14 +400,17 @@ static struct resource sdhi1_resources[] = { | |||
397 | .flags = IORESOURCE_MEM, | 400 | .flags = IORESOURCE_MEM, |
398 | }, | 401 | }, |
399 | [1] = { | 402 | [1] = { |
403 | .name = SH_MOBILE_SDHI_IRQ_CARD_DETECT, | ||
400 | .start = gic_spi(87), | 404 | .start = gic_spi(87), |
401 | .flags = IORESOURCE_IRQ, | 405 | .flags = IORESOURCE_IRQ, |
402 | }, | 406 | }, |
403 | [2] = { | 407 | [2] = { |
408 | .name = SH_MOBILE_SDHI_IRQ_SDCARD, | ||
404 | .start = gic_spi(88), | 409 | .start = gic_spi(88), |
405 | .flags = IORESOURCE_IRQ, | 410 | .flags = IORESOURCE_IRQ, |
406 | }, | 411 | }, |
407 | [3] = { | 412 | [3] = { |
413 | .name = SH_MOBILE_SDHI_IRQ_SDIO, | ||
408 | .start = gic_spi(89), | 414 | .start = gic_spi(89), |
409 | .flags = IORESOURCE_IRQ, | 415 | .flags = IORESOURCE_IRQ, |
410 | }, | 416 | }, |
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index 17c19dc2560..9459f132573 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c | |||
@@ -1070,14 +1070,17 @@ static struct resource sdhi1_resources[] = { | |||
1070 | .flags = IORESOURCE_MEM, | 1070 | .flags = IORESOURCE_MEM, |
1071 | }, | 1071 | }, |
1072 | [1] = { | 1072 | [1] = { |
1073 | .name = SH_MOBILE_SDHI_IRQ_CARD_DETECT, | ||
1073 | .start = evt2irq(0x0e80), /* SDHI1_SDHI1I0 */ | 1074 | .start = evt2irq(0x0e80), /* SDHI1_SDHI1I0 */ |
1074 | .flags = IORESOURCE_IRQ, | 1075 | .flags = IORESOURCE_IRQ, |
1075 | }, | 1076 | }, |
1076 | [2] = { | 1077 | [2] = { |
1078 | .name = SH_MOBILE_SDHI_IRQ_SDCARD, | ||
1077 | .start = evt2irq(0x0ea0), /* SDHI1_SDHI1I1 */ | 1079 | .start = evt2irq(0x0ea0), /* SDHI1_SDHI1I1 */ |
1078 | .flags = IORESOURCE_IRQ, | 1080 | .flags = IORESOURCE_IRQ, |
1079 | }, | 1081 | }, |
1080 | [3] = { | 1082 | [3] = { |
1083 | .name = SH_MOBILE_SDHI_IRQ_SDIO, | ||
1081 | .start = evt2irq(0x0ec0), /* SDHI1_SDHI1I2 */ | 1084 | .start = evt2irq(0x0ec0), /* SDHI1_SDHI1I2 */ |
1082 | .flags = IORESOURCE_IRQ, | 1085 | .flags = IORESOURCE_IRQ, |
1083 | }, | 1086 | }, |
@@ -1121,14 +1124,17 @@ static struct resource sdhi2_resources[] = { | |||
1121 | .flags = IORESOURCE_MEM, | 1124 | .flags = IORESOURCE_MEM, |
1122 | }, | 1125 | }, |
1123 | [1] = { | 1126 | [1] = { |
1127 | .name = SH_MOBILE_SDHI_IRQ_CARD_DETECT, | ||
1124 | .start = evt2irq(0x1200), /* SDHI2_SDHI2I0 */ | 1128 | .start = evt2irq(0x1200), /* SDHI2_SDHI2I0 */ |
1125 | .flags = IORESOURCE_IRQ, | 1129 | .flags = IORESOURCE_IRQ, |
1126 | }, | 1130 | }, |
1127 | [2] = { | 1131 | [2] = { |
1132 | .name = SH_MOBILE_SDHI_IRQ_SDCARD, | ||
1128 | .start = evt2irq(0x1220), /* SDHI2_SDHI2I1 */ | 1133 | .start = evt2irq(0x1220), /* SDHI2_SDHI2I1 */ |
1129 | .flags = IORESOURCE_IRQ, | 1134 | .flags = IORESOURCE_IRQ, |
1130 | }, | 1135 | }, |
1131 | [3] = { | 1136 | [3] = { |
1137 | .name = SH_MOBILE_SDHI_IRQ_SDIO, | ||
1132 | .start = evt2irq(0x1240), /* SDHI2_SDHI2I2 */ | 1138 | .start = evt2irq(0x1240), /* SDHI2_SDHI2I2 */ |
1133 | .flags = IORESOURCE_IRQ, | 1139 | .flags = IORESOURCE_IRQ, |
1134 | }, | 1140 | }, |