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 8ce03e00b0ae34a97a939e4c9a1d250fdce6b309..fede36361dc78065c7999014ac3e61be16bf1b95 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 1062346e1d342afbb5610e33801153d44d1cc772..3ab5fc4b55b79b96231342bc408dea99841e039b 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 bea9848e5ff895422a6f9a7b9f29a372b154c2db..e62107d46fd9884301c5710268e408c0cdc9fbc1 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 0e26d3e7e4e15fb542829c09265947687cbd467b..abc5b6d418fed086e5c82f96c0c33d91892c2f61 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 5f041f86e3ddc019f361d9ccc02f345a1cd97151..293ba464f33431d6e88dea7a5c44dc02a5c3a651 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 8fec155e2ff7f86816c8e90264906381fc766f6b..c9431b3a051b48694fd24771e8b662a103c24f10 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 5172f994a1bef8b2c8ecabb4ac40b798c9a6ff24..d07a3368f5462d4253ac1d4b6ca6c5ce6cfbab6d 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 8f1c8a617bb511e0b7026721a78504c7bdb60af4..03b63457e1780c9fb3c77ec5bf185eaa4abfd7f0 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 5ed196827b0a899e08dd4118d1fbb018fb4224ea..b007defc99457f706608b320606290aeda56a487 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 15c3ea4de92093750a5f0d75df90b19fded60a8f..76e53b26a808d4a8dc976acd87d7e6711c41951d 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 df96312efd45fd2af255f2c9427818a869966b3a..934ac4f1c48f2039ccf47e113150eaa7ce7fba39 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,
        },
 };