aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2013-03-29 17:05:48 -0400
committerSimon Horman <horms+renesas@verge.net.au>2013-04-02 21:50:43 -0400
commitfb7a89c4afa43240af705db44e3e41233016adf9 (patch)
tree69f5f89c4b5cdc73cbdd34bd18f2caeb2e0f6f17 /arch/arm/mach-shmobile
parent3cc828fdb32281cc8166d3a40bee32b90ce3cad8 (diff)
ARM: shmobile: mackerel: SDHI resources do not have to be numbered
The SDHI driver doesn't care about platform resource order, explicit resource numbering is redundant. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r--arch/arm/mach-shmobile/board-mackerel.c33
1 files changed, 12 insertions, 21 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 1a9c75383ca0..c4f80d4e4026 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -982,21 +982,18 @@ static struct sh_mobile_sdhi_info sdhi0_info = {
982}; 982};
983 983
984static struct resource sdhi0_resources[] = { 984static struct resource sdhi0_resources[] = {
985 [0] = { 985 {
986 .name = "SDHI0", 986 .name = "SDHI0",
987 .start = 0xe6850000, 987 .start = 0xe6850000,
988 .end = 0xe68500ff, 988 .end = 0xe68500ff,
989 .flags = IORESOURCE_MEM, 989 .flags = IORESOURCE_MEM,
990 }, 990 }, {
991 [1] = {
992 .start = evt2irq(0x0e00) /* SDHI0_SDHI0I0 */, 991 .start = evt2irq(0x0e00) /* SDHI0_SDHI0I0 */,
993 .flags = IORESOURCE_IRQ, 992 .flags = IORESOURCE_IRQ,
994 }, 993 }, {
995 [2] = {
996 .start = evt2irq(0x0e20) /* SDHI0_SDHI0I1 */, 994 .start = evt2irq(0x0e20) /* SDHI0_SDHI0I1 */,
997 .flags = IORESOURCE_IRQ, 995 .flags = IORESOURCE_IRQ,
998 }, 996 }, {
999 [3] = {
1000 .start = evt2irq(0x0e40) /* SDHI0_SDHI0I2 */, 997 .start = evt2irq(0x0e40) /* SDHI0_SDHI0I2 */,
1001 .flags = IORESOURCE_IRQ, 998 .flags = IORESOURCE_IRQ,
1002 }, 999 },
@@ -1025,23 +1022,20 @@ static struct sh_mobile_sdhi_info sdhi1_info = {
1025}; 1022};
1026 1023
1027static struct resource sdhi1_resources[] = { 1024static struct resource sdhi1_resources[] = {
1028 [0] = { 1025 {
1029 .name = "SDHI1", 1026 .name = "SDHI1",
1030 .start = 0xe6860000, 1027 .start = 0xe6860000,
1031 .end = 0xe68600ff, 1028 .end = 0xe68600ff,
1032 .flags = IORESOURCE_MEM, 1029 .flags = IORESOURCE_MEM,
1033 }, 1030 }, {
1034 [1] = {
1035 .name = SH_MOBILE_SDHI_IRQ_CARD_DETECT, 1031 .name = SH_MOBILE_SDHI_IRQ_CARD_DETECT,
1036 .start = evt2irq(0x0e80), /* SDHI1_SDHI1I0 */ 1032 .start = evt2irq(0x0e80), /* SDHI1_SDHI1I0 */
1037 .flags = IORESOURCE_IRQ, 1033 .flags = IORESOURCE_IRQ,
1038 }, 1034 }, {
1039 [2] = {
1040 .name = SH_MOBILE_SDHI_IRQ_SDCARD, 1035 .name = SH_MOBILE_SDHI_IRQ_SDCARD,
1041 .start = evt2irq(0x0ea0), /* SDHI1_SDHI1I1 */ 1036 .start = evt2irq(0x0ea0), /* SDHI1_SDHI1I1 */
1042 .flags = IORESOURCE_IRQ, 1037 .flags = IORESOURCE_IRQ,
1043 }, 1038 }, {
1044 [3] = {
1045 .name = SH_MOBILE_SDHI_IRQ_SDIO, 1039 .name = SH_MOBILE_SDHI_IRQ_SDIO,
1046 .start = evt2irq(0x0ec0), /* SDHI1_SDHI1I2 */ 1040 .start = evt2irq(0x0ec0), /* SDHI1_SDHI1I2 */
1047 .flags = IORESOURCE_IRQ, 1041 .flags = IORESOURCE_IRQ,
@@ -1079,23 +1073,20 @@ static struct sh_mobile_sdhi_info sdhi2_info = {
1079}; 1073};
1080 1074
1081static struct resource sdhi2_resources[] = { 1075static struct resource sdhi2_resources[] = {
1082 [0] = { 1076 {
1083 .name = "SDHI2", 1077 .name = "SDHI2",
1084 .start = 0xe6870000, 1078 .start = 0xe6870000,
1085 .end = 0xe68700ff, 1079 .end = 0xe68700ff,
1086 .flags = IORESOURCE_MEM, 1080 .flags = IORESOURCE_MEM,
1087 }, 1081 }, {
1088 [1] = {
1089 .name = SH_MOBILE_SDHI_IRQ_CARD_DETECT, 1082 .name = SH_MOBILE_SDHI_IRQ_CARD_DETECT,
1090 .start = evt2irq(0x1200), /* SDHI2_SDHI2I0 */ 1083 .start = evt2irq(0x1200), /* SDHI2_SDHI2I0 */
1091 .flags = IORESOURCE_IRQ, 1084 .flags = IORESOURCE_IRQ,
1092 }, 1085 }, {
1093 [2] = {
1094 .name = SH_MOBILE_SDHI_IRQ_SDCARD, 1086 .name = SH_MOBILE_SDHI_IRQ_SDCARD,
1095 .start = evt2irq(0x1220), /* SDHI2_SDHI2I1 */ 1087 .start = evt2irq(0x1220), /* SDHI2_SDHI2I1 */
1096 .flags = IORESOURCE_IRQ, 1088 .flags = IORESOURCE_IRQ,
1097 }, 1089 }, {
1098 [3] = {
1099 .name = SH_MOBILE_SDHI_IRQ_SDIO, 1090 .name = SH_MOBILE_SDHI_IRQ_SDIO,
1100 .start = evt2irq(0x1240), /* SDHI2_SDHI2I2 */ 1091 .start = evt2irq(0x1240), /* SDHI2_SDHI2I2 */
1101 .flags = IORESOURCE_IRQ, 1092 .flags = IORESOURCE_IRQ,