sh: Fix up heartbeat build and resource size.

We were abusing the resource size for the number of bits, this
has been reworked using proper platform data, so this can be
tidied up now. Boards in general only have a 1-byte wide resource,
which the ioremap_nocache() case already handles.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/boards/mpc1211/setup.c b/arch/sh/boards/mpc1211/setup.c
index 8ce03e0..fede363 100644 (file)
--- a/arch/sh/boards/mpc1211/setup.c
+++ b/arch/sh/boards/mpc1211/setup.c
@@ -285,7 +285,7 @@ static int put_smb_blk(unsigned char *p, int address, int command, int no)
 static struct resource heartbeat_resources[] = {
        [0] = {
                .start  = 0xa2000000,
-               .end    = 0xa2000000 + 8 - 1,
+               .end    = 0xa2000000,
                .flags  = IORESOURCE_MEM,
        },
 };

diff --git a/arch/sh/boards/renesas/r7780rp/setup.c b/arch/sh/boards/renesas/r7780rp/setup.c
index 1062346..3ab5fc4 100644 (file)
--- a/arch/sh/boards/renesas/r7780rp/setup.c
+++ b/arch/sh/boards/renesas/r7780rp/setup.c
@@ -112,7 +112,7 @@ static struct platform_device cf_ide_device  = {
 static struct resource heartbeat_resources[] = {
        [0] = {
                .start  = PA_OBLED,
-               .end    = PA_OBLED + 8 - 1,
+               .end    = PA_OBLED,
                .flags  = IORESOURCE_MEM,
        },
 };
@@ -133,7 +133,7 @@ static struct platform_device heartbeat_device = {
        /* R7785RP has a slightly more sensible FPGA.. */
 #ifndef CONFIG_SH_R7785RP
        .dev    = {
-               .platform_data  = heartbeat_data,
+               .platform_data  = &heartbeat_data,
        },
 #endif
        .num_resources  = ARRAY_SIZE(heartbeat_resources),

diff --git a/arch/sh/boards/renesas/rts7751r2d/setup.c b/arch/sh/boards/renesas/rts7751r2d/setup.c
index bea9848..e62107d 100644 (file)
--- a/arch/sh/boards/renesas/rts7751r2d/setup.c
+++ b/arch/sh/boards/renesas/rts7751r2d/setup.c
@@ -76,7 +76,7 @@ static struct platform_device cf_ide_device  = {
 static struct resource heartbeat_resources[] = {
        [0] = {
                .start  = PA_OUTPORT,
-               .end    = PA_OUTPORT + 8 - 1,
+               .end    = PA_OUTPORT,
                .flags  = IORESOURCE_MEM,
        },
 };

diff --git a/arch/sh/boards/renesas/x3proto/setup.c b/arch/sh/boards/renesas/x3proto/setup.c
index 0e26d3e..abc5b6d 100644 (file)
--- a/arch/sh/boards/renesas/x3proto/setup.c
+++ b/arch/sh/boards/renesas/x3proto/setup.c
@@ -18,7 +18,7 @@
 static struct resource heartbeat_resources[] = {
        [0] = {
                .start  = 0xb8140020,
-               .end    = 0xb8140020 + 8 - 1,
+               .end    = 0xb8140020,
                .flags  = IORESOURCE_MEM,
        },
 };

diff --git a/arch/sh/boards/se/7206/setup.c b/arch/sh/boards/se/7206/setup.c
index 5f041f8..293ba46 100644 (file)
--- a/arch/sh/boards/se/7206/setup.c
+++ b/arch/sh/boards/se/7206/setup.c
@@ -46,7 +46,7 @@ static struct heartbeat_data heartbeat_data = {
 static struct resource heartbeat_resources[] = {
        [0] = {
                .start  = PA_LED,
-               .end    = PA_LED + ARRAY_SIZE(heartbeat_bit_pos) - 1,
+               .end    = PA_LED,
                .flags  = IORESOURCE_MEM,
        },
 };
@@ -55,7 +55,7 @@ static struct platform_device heartbeat_device = {
        .name           = "heartbeat",
        .id             = -1,
        .dev    = {
-               .platform_data  = heartbeat_data,
+               .platform_data  = &heartbeat_data,
        },
        .num_resources  = ARRAY_SIZE(heartbeat_resources),
        .resource       = heartbeat_resources,

diff --git a/arch/sh/boards/se/7343/setup.c b/arch/sh/boards/se/7343/setup.c
index 8fec155..c9431b3 100644 (file)
--- a/arch/sh/boards/se/7343/setup.c
+++ b/arch/sh/boards/se/7343/setup.c
@@ -33,7 +33,7 @@ static struct platform_device smc91x_device = {
 static struct resource heartbeat_resources[] = {
        [0] = {
                .start  = PA_LED,
-               .end    = PA_LED + 8 - 1,
+               .end    = PA_LED,
                .flags  = IORESOURCE_MEM,
        },
 };

diff --git a/arch/sh/boards/se/770x/setup.c b/arch/sh/boards/se/770x/setup.c
index 5172f99..d07a336 100644 (file)
--- a/arch/sh/boards/se/770x/setup.c
+++ b/arch/sh/boards/se/770x/setup.c
@@ -99,7 +99,7 @@ static struct heartbeat_data heartbeat_data = {
 static struct resource heartbeat_resources[] = {
        [0] = {
                .start  = PA_LED,
-               .end    = PA_LED + ARRAY_SIZE(heartbeat_bit_pos) - 1,
+               .end    = PA_LED,
                .flags  = IORESOURCE_MEM,
        },
 };
@@ -108,7 +108,7 @@ static struct platform_device heartbeat_device = {
        .name           = "heartbeat",
        .id             = -1,
        .dev    = {
-               .platform_data  = heartbeat_data,
+               .platform_data  = &heartbeat_data,
        },
        .num_resources  = ARRAY_SIZE(heartbeat_resources),
        .resource       = heartbeat_resources,

diff --git a/arch/sh/boards/se/7722/setup.c b/arch/sh/boards/se/7722/setup.c
index 8f1c8a6..03b6345 100644 (file)
--- a/arch/sh/boards/se/7722/setup.c
+++ b/arch/sh/boards/se/7722/setup.c
@@ -21,7 +21,7 @@
 static struct resource heartbeat_resources[] = {
        [0] = {
                .start  = PA_LED,
-               .end    = PA_LED + 8 - 1,
+               .end    = PA_LED,
                .flags  = IORESOURCE_MEM,
        },
 };

diff --git a/arch/sh/boards/se/7751/setup.c b/arch/sh/boards/se/7751/setup.c
index 5ed1968..b007def 100644 (file)
--- a/arch/sh/boards/se/7751/setup.c
+++ b/arch/sh/boards/se/7751/setup.c
@@ -25,7 +25,7 @@ static struct heartbeat_data heartbeat_data = {
 static struct resource heartbeat_resources[] = {
        [0] = {
                .start  = PA_LED,
-               .end    = PA_LED + ARRAY_SIZE(heartbeat_bit_pos) - 1,
+               .end    = PA_LED,
                .flags  = IORESOURCE_MEM,
        },
 };
@@ -34,7 +34,7 @@ static struct platform_device heartbeat_device = {
        .name           = "heartbeat",
        .id             = -1,
        .dev    = {
-               .platform_data  = heartbeat_data,
+               .platform_data  = &heartbeat_data,
        },
        .num_resources  = ARRAY_SIZE(heartbeat_resources),
        .resource       = heartbeat_resources,

diff --git a/arch/sh/boards/se/7780/setup.c b/arch/sh/boards/se/7780/setup.c
index 15c3ea4..76e53b2 100644 (file)
--- a/arch/sh/boards/se/7780/setup.c
+++ b/arch/sh/boards/se/7780/setup.c
@@ -19,7 +19,7 @@
 static struct resource heartbeat_resources[] = {
        [0] = {
                .start  = PA_LED,
-               .end    = PA_LED + 8 - 1,
+               .end    = PA_LED,
                .flags  = IORESOURCE_MEM,
        },
 };

diff --git a/arch/sh/boards/sh03/setup.c b/arch/sh/boards/sh03/setup.c
index df96312..934ac4f 100644 (file)
--- a/arch/sh/boards/sh03/setup.c
+++ b/arch/sh/boards/sh03/setup.c
@@ -44,7 +44,7 @@ static void __init sh03_setup(char **cmdline_p)
 static struct resource heartbeat_resources[] = {
        [0] = {
                .start  = 0xa0800000,
-               .end    = 0xa0800000 + 8 - 1,
+               .end    = 0xa0800000,
                .flags  = IORESOURCE_MEM,
        },
 };