sh: se7206: heartbeat needs 32-bit writes.

[linux-2.6-omap-h63xx.git] / arch / sh / boards / se / 7206 / setup.c

diff --git a/arch/sh/boards/se/7206/setup.c b/arch/sh/boards/se/7206/setup.c
index ca714879f55972bba43862ba70073702c9612d22..5b3ee089d91de3acc943cc3ef142dac056072b60 100644 (file)
--- a/arch/sh/boards/se/7206/setup.c
+++ b/arch/sh/boards/se/7206/setup.c
@@ -6,14 +6,13 @@
  * Copyright (C) 2007  Paul Mundt
  *
  * Hitachi 7206 SolutionEngine Support.
- *
  */
-
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <asm/se7206.h>
 #include <asm/io.h>
 #include <asm/machvec.h>
+#include <asm/heartbeat.h>
 
 static struct resource smc91x_resources[] = {
        [0] = {
@@ -37,10 +36,16 @@ static struct platform_device smc91x_device = {
 
 static unsigned char heartbeat_bit_pos[] = { 8, 9, 10, 11, 12, 13, 14, 15 };
 
+static struct heartbeat_data heartbeat_data = {
+       .bit_pos        = heartbeat_bit_pos,
+       .nr_bits        = ARRAY_SIZE(heartbeat_bit_pos),
+       .regsize        = 32,
+};
+
 static struct resource heartbeat_resources[] = {
        [0] = {
                .start  = PA_LED,
-               .end    = PA_LED + ARRAY_SIZE(heartbeat_bit_pos) - 1,
+               .end    = PA_LED,
                .flags  = IORESOURCE_MEM,
        },
 };
@@ -49,7 +54,7 @@ static struct platform_device heartbeat_device = {
        .name           = "heartbeat",
        .id             = -1,
        .dev    = {
-               .platform_data  = heartbeat_bit_pos,
+               .platform_data  = &heartbeat_data,
        },
        .num_resources  = ARRAY_SIZE(heartbeat_resources),
        .resource       = heartbeat_resources,
@@ -70,30 +75,23 @@ __initcall(se7206_devices_setup);
  * The Machine Vector
  */
 
-struct sh_machine_vector mv_se __initmv = {
+static struct sh_machine_vector mv_se __initmv = {
        .mv_name                = "SolutionEngine",
        .mv_nr_irqs             = 256,
        .mv_inb                 = se7206_inb,
        .mv_inw                 = se7206_inw,
-       .mv_inl                 = se7206_inl,
        .mv_outb                = se7206_outb,
        .mv_outw                = se7206_outw,
-       .mv_outl                = se7206_outl,
 
        .mv_inb_p               = se7206_inb_p,
        .mv_inw_p               = se7206_inw,
-       .mv_inl_p               = se7206_inl,
        .mv_outb_p              = se7206_outb_p,
        .mv_outw_p              = se7206_outw,
-       .mv_outl_p              = se7206_outl,
 
        .mv_insb                = se7206_insb,
        .mv_insw                = se7206_insw,
-       .mv_insl                = se7206_insl,
        .mv_outsb               = se7206_outsb,
        .mv_outsw               = se7206_outsw,
-       .mv_outsl               = se7206_outsl,
 
        .mv_init_irq            = init_se7206_IRQ,
 };
-ALIAS_MV(se)