aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2007-03-28 16:09:36 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-05-09 05:39:42 -0400
commite0b50d3c644f10a0022b23fccb58c8003741db52 (patch)
tree5e38fb2e26085348f12f935aa3c6aa9e544ca7e3 /arch/arm
parentb1465bf7098fa761962f09a6bb2c0e831af85e63 (diff)
ARM: OMAP: partial LED fixes
Partial fix for CONFIG_LEDS breakage ... at least allow platforms using the debug-leds support (H4 for now) to build with the generic LED support, and default the LED that would be the timer LED to trigger using the "heartbeat" (timer driven, rate depends on load). Right now only H2 and P2 seem to have working LED support; this at least makes H4 less broken. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/plat-omap/debug-leds.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/arch/arm/plat-omap/debug-leds.c b/arch/arm/plat-omap/debug-leds.c
index 511d6a50041e..9128a80d228f 100644
--- a/arch/arm/plat-omap/debug-leds.c
+++ b/arch/arm/plat-omap/debug-leds.c
@@ -39,12 +39,6 @@ static struct h2p2_dbg_fpga __iomem *fpga;
39static u16 led_state, hw_led_state; 39static u16 led_state, hw_led_state;
40 40
41 41
42#ifdef CONFIG_LEDS
43#define old_led_api() 1
44#else
45#define old_led_api() 0
46#endif
47
48#ifdef CONFIG_LEDS_OMAP_DEBUG 42#ifdef CONFIG_LEDS_OMAP_DEBUG
49#define new_led_api() 1 43#define new_led_api() 1
50#else 44#else
@@ -202,7 +196,8 @@ struct dbg_led {
202static struct dbg_led dbg_leds[] = { 196static struct dbg_led dbg_leds[] = {
203 /* REVISIT at least H2 uses different timer & cpu leds... */ 197 /* REVISIT at least H2 uses different timer & cpu leds... */
204#ifndef CONFIG_LEDS_TIMER 198#ifndef CONFIG_LEDS_TIMER
205 { .mask = 1 << 0, .cdev.name = "d4:green", }, /* timer */ 199 { .mask = 1 << 0, .cdev.name = "d4:green",
200 .cdev.default_trigger = "heartbeat", },
206#endif 201#endif
207#ifndef CONFIG_LEDS_CPU 202#ifndef CONFIG_LEDS_CPU
208 { .mask = 1 << 1, .cdev.name = "d5:green", }, /* !idle */ 203 { .mask = 1 << 1, .cdev.name = "d5:green", }, /* !idle */
@@ -274,10 +269,10 @@ static int /* __init */ fpga_probe(struct platform_device *pdev)
274 fpga = ioremap(iomem->start, H2P2_DBG_FPGA_SIZE); 269 fpga = ioremap(iomem->start, H2P2_DBG_FPGA_SIZE);
275 __raw_writew(~0, &fpga->leds); 270 __raw_writew(~0, &fpga->leds);
276 271
277 if (old_led_api()) { 272#ifdef CONFIG_LEDS
278 leds_event = h2p2_dbg_leds_event; 273 leds_event = h2p2_dbg_leds_event;
279 leds_event(led_start); 274 leds_event(led_start);
280 } 275#endif
281 276
282 if (new_led_api()) { 277 if (new_led_api()) {
283 newled_init(&pdev->dev); 278 newled_init(&pdev->dev);