Commit fb7a89c4 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Simon Horman

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: default avatarGuennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Acked-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 3cc828fd
...@@ -982,21 +982,18 @@ static struct sh_mobile_sdhi_info sdhi0_info = { ...@@ -982,21 +982,18 @@ static struct sh_mobile_sdhi_info sdhi0_info = {
}; };
static struct resource sdhi0_resources[] = { static struct resource sdhi0_resources[] = {
[0] = { {
.name = "SDHI0", .name = "SDHI0",
.start = 0xe6850000, .start = 0xe6850000,
.end = 0xe68500ff, .end = 0xe68500ff,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, }, {
[1] = {
.start = evt2irq(0x0e00) /* SDHI0_SDHI0I0 */, .start = evt2irq(0x0e00) /* SDHI0_SDHI0I0 */,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, }, {
[2] = {
.start = evt2irq(0x0e20) /* SDHI0_SDHI0I1 */, .start = evt2irq(0x0e20) /* SDHI0_SDHI0I1 */,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, }, {
[3] = {
.start = evt2irq(0x0e40) /* SDHI0_SDHI0I2 */, .start = evt2irq(0x0e40) /* SDHI0_SDHI0I2 */,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
...@@ -1025,23 +1022,20 @@ static struct sh_mobile_sdhi_info sdhi1_info = { ...@@ -1025,23 +1022,20 @@ static struct sh_mobile_sdhi_info sdhi1_info = {
}; };
static struct resource sdhi1_resources[] = { static struct resource sdhi1_resources[] = {
[0] = { {
.name = "SDHI1", .name = "SDHI1",
.start = 0xe6860000, .start = 0xe6860000,
.end = 0xe68600ff, .end = 0xe68600ff,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, }, {
[1] = {
.name = SH_MOBILE_SDHI_IRQ_CARD_DETECT, .name = SH_MOBILE_SDHI_IRQ_CARD_DETECT,
.start = evt2irq(0x0e80), /* SDHI1_SDHI1I0 */ .start = evt2irq(0x0e80), /* SDHI1_SDHI1I0 */
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, }, {
[2] = {
.name = SH_MOBILE_SDHI_IRQ_SDCARD, .name = SH_MOBILE_SDHI_IRQ_SDCARD,
.start = evt2irq(0x0ea0), /* SDHI1_SDHI1I1 */ .start = evt2irq(0x0ea0), /* SDHI1_SDHI1I1 */
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, }, {
[3] = {
.name = SH_MOBILE_SDHI_IRQ_SDIO, .name = SH_MOBILE_SDHI_IRQ_SDIO,
.start = evt2irq(0x0ec0), /* SDHI1_SDHI1I2 */ .start = evt2irq(0x0ec0), /* SDHI1_SDHI1I2 */
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
...@@ -1079,23 +1073,20 @@ static struct sh_mobile_sdhi_info sdhi2_info = { ...@@ -1079,23 +1073,20 @@ static struct sh_mobile_sdhi_info sdhi2_info = {
}; };
static struct resource sdhi2_resources[] = { static struct resource sdhi2_resources[] = {
[0] = { {
.name = "SDHI2", .name = "SDHI2",
.start = 0xe6870000, .start = 0xe6870000,
.end = 0xe68700ff, .end = 0xe68700ff,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, }, {
[1] = {
.name = SH_MOBILE_SDHI_IRQ_CARD_DETECT, .name = SH_MOBILE_SDHI_IRQ_CARD_DETECT,
.start = evt2irq(0x1200), /* SDHI2_SDHI2I0 */ .start = evt2irq(0x1200), /* SDHI2_SDHI2I0 */
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, }, {
[2] = {
.name = SH_MOBILE_SDHI_IRQ_SDCARD, .name = SH_MOBILE_SDHI_IRQ_SDCARD,
.start = evt2irq(0x1220), /* SDHI2_SDHI2I1 */ .start = evt2irq(0x1220), /* SDHI2_SDHI2I1 */
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, }, {
[3] = {
.name = SH_MOBILE_SDHI_IRQ_SDIO, .name = SH_MOBILE_SDHI_IRQ_SDIO,
.start = evt2irq(0x1240), /* SDHI2_SDHI2I2 */ .start = evt2irq(0x1240), /* SDHI2_SDHI2I2 */
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment