summaryrefslogtreecommitdiffstats
path: root/arch/sh/boards/se/7722
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-08-20 13:03:41 +0900
committerPaul Mundt <lethal@linux-sh.org>2007-09-21 11:57:51 +0900
commit8786c952c1682a132e99b736beae4523e409b13d (patch)
treefec83f758cf197fb4515675ceb8c023ecd60dc20 /arch/sh/boards/se/7722
parent2eb0303c2cd536d7f15c7f3bafc848b850a447f0 (diff)
downloadblackbird-op-linux-8786c952c1682a132e99b736beae4523e409b13d.tar.gz
blackbird-op-linux-8786c952c1682a132e99b736beae4523e409b13d.zip
sh: heartbeat driver update.
Add some flags for the heartbeat driver, and kill off some duplication in the bit positions for the boards that don't have special cases. This also allows for variable access widths and inversion. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards/se/7722')
-rw-r--r--arch/sh/boards/se/7722/setup.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/sh/boards/se/7722/setup.c b/arch/sh/boards/se/7722/setup.c
index 495fc7e2b60f..8f1c8a617bb5 100644
--- a/arch/sh/boards/se/7722/setup.c
+++ b/arch/sh/boards/se/7722/setup.c
@@ -18,12 +18,10 @@
#include <asm/io.h>
/* Heartbeat */
-static unsigned char heartbeat_bit_pos[] = { 0, 1, 2, 3, 4, 5, 6, 7 };
-
static struct resource heartbeat_resources[] = {
[0] = {
.start = PA_LED,
- .end = PA_LED + ARRAY_SIZE(heartbeat_bit_pos) - 1,
+ .end = PA_LED + 8 - 1,
.flags = IORESOURCE_MEM,
},
};
@@ -31,9 +29,6 @@ static struct resource heartbeat_resources[] = {
static struct platform_device heartbeat_device = {
.name = "heartbeat",
.id = -1,
- .dev = {
- .platform_data = heartbeat_bit_pos,
- },
.num_resources = ARRAY_SIZE(heartbeat_resources),
.resource = heartbeat_resources,
};
@@ -109,7 +104,7 @@ static void __init se7722_setup(char **cmdline_p)
ctrl_outl(0x00051001, MSTPCR0);
ctrl_outl(0x00000000, MSTPCR1);
/* KEYSC, VOU, BEU, CEU, VEU, VPU, LCDC */
- ctrl_outl(0xffffbfC0, MSTPCR2);
+ ctrl_outl(0xffffbfC0, MSTPCR2);
ctrl_outw(0x0000, PORT_PECR); /* PORT E 1 = IRQ5 ,E 0 = BS */
ctrl_outw(0x1000, PORT_PJCR); /* PORT J 1 = IRQ1,J 0 =IRQ0 */
OpenPOWER on IntegriCloud