ARM: OMAP: Use gpiolib with tps65010 for OSK 5912
Convert OSK board to use new tps65010 gpiolib support. This includes moving its LED support from leds-osk to gpio-leds, giving more trigger options and a net platform code shrink. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:

committed by
Tony Lindgren

parent
79966fd9b4
commit
d94577d5a5
@@ -1,11 +1,9 @@
|
||||
/*
|
||||
* linux/arch/arm/mach-omap1/leds-osk.c
|
||||
*
|
||||
* LED driver for OSK, and optionally Mistral QVGA, boards
|
||||
* LED driver for OSK with optional Mistral QVGA board
|
||||
*/
|
||||
#include <linux/init.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include <linux/i2c/tps65010.h>
|
||||
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/leds.h>
|
||||
@@ -20,49 +18,11 @@
|
||||
#define LED_STATE_CLAIMED (1 << 1)
|
||||
static u8 led_state;
|
||||
|
||||
#define GREEN_LED (1 << 0) /* TPS65010 LED1 */
|
||||
#define AMBER_LED (1 << 1) /* TPS65010 LED2 */
|
||||
#define RED_LED (1 << 2) /* TPS65010 GPIO2 */
|
||||
#define TIMER_LED (1 << 3) /* Mistral board */
|
||||
#define IDLE_LED (1 << 4) /* Mistral board */
|
||||
static u8 hw_led_state;
|
||||
|
||||
|
||||
/* TPS65010 leds are changed using i2c -- from a task context.
|
||||
* Using one of these for the "idle" LED would be impractical...
|
||||
*/
|
||||
#define TPS_LEDS (GREEN_LED | RED_LED | AMBER_LED)
|
||||
|
||||
static u8 tps_leds_change;
|
||||
|
||||
static void tps_work(struct work_struct *unused)
|
||||
{
|
||||
for (;;) {
|
||||
u8 leds;
|
||||
|
||||
local_irq_disable();
|
||||
leds = tps_leds_change;
|
||||
tps_leds_change = 0;
|
||||
local_irq_enable();
|
||||
|
||||
if (!leds)
|
||||
break;
|
||||
|
||||
/* careful: the set_led() value is on/off/blink */
|
||||
if (leds & GREEN_LED)
|
||||
tps65010_set_led(LED1, !!(hw_led_state & GREEN_LED));
|
||||
if (leds & AMBER_LED)
|
||||
tps65010_set_led(LED2, !!(hw_led_state & AMBER_LED));
|
||||
|
||||
/* the gpio led doesn't have that issue */
|
||||
if (leds & RED_LED)
|
||||
tps65010_set_gpio_out_value(GPIO2,
|
||||
!(hw_led_state & RED_LED));
|
||||
}
|
||||
}
|
||||
|
||||
static DECLARE_WORK(work, tps_work);
|
||||
|
||||
#ifdef CONFIG_OMAP_OSK_MISTRAL
|
||||
|
||||
/* For now, all system indicators require the Mistral board, since that
|
||||
@@ -112,7 +72,6 @@ void osk_leds_event(led_event_t evt)
|
||||
case led_stop:
|
||||
led_state &= ~LED_STATE_ENABLED;
|
||||
hw_led_state = 0;
|
||||
/* NOTE: work may still be pending!! */
|
||||
break;
|
||||
|
||||
case led_claim:
|
||||
@@ -145,48 +104,11 @@ void osk_leds_event(led_event_t evt)
|
||||
|
||||
#endif /* CONFIG_OMAP_OSK_MISTRAL */
|
||||
|
||||
/* "green" == tps LED1 (leftmost, normally power-good)
|
||||
* works only with DC adapter, not on battery power!
|
||||
*/
|
||||
case led_green_on:
|
||||
if (led_state & LED_STATE_CLAIMED)
|
||||
hw_led_state |= GREEN_LED;
|
||||
break;
|
||||
case led_green_off:
|
||||
if (led_state & LED_STATE_CLAIMED)
|
||||
hw_led_state &= ~GREEN_LED;
|
||||
break;
|
||||
|
||||
/* "amber" == tps LED2 (middle) */
|
||||
case led_amber_on:
|
||||
if (led_state & LED_STATE_CLAIMED)
|
||||
hw_led_state |= AMBER_LED;
|
||||
break;
|
||||
case led_amber_off:
|
||||
if (led_state & LED_STATE_CLAIMED)
|
||||
hw_led_state &= ~AMBER_LED;
|
||||
break;
|
||||
|
||||
/* "red" == LED on tps gpio3 (rightmost) */
|
||||
case led_red_on:
|
||||
if (led_state & LED_STATE_CLAIMED)
|
||||
hw_led_state |= RED_LED;
|
||||
break;
|
||||
case led_red_off:
|
||||
if (led_state & LED_STATE_CLAIMED)
|
||||
hw_led_state &= ~RED_LED;
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
leds ^= hw_led_state;
|
||||
leds &= TPS_LEDS;
|
||||
if (leds && (led_state & LED_STATE_CLAIMED)) {
|
||||
tps_leds_change |= leds;
|
||||
schedule_work(&work);
|
||||
}
|
||||
|
||||
done:
|
||||
local_irq_restore(flags);
|
||||
|
Reference in New Issue
Block a user