summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrover Yen <Grover_Yen@wistron.com>2015-08-03 15:57:50 +0800
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-08-21 02:06:57 +0000
commit3d686709f0a13f406941e2b8c68a11683fe971b1 (patch)
tree4dcb8dd2d79297b16b99f72dbef22f68df0ceb51
parentf2417280e036ecbfcef6ee69e5f985de4f2180c3 (diff)
downloadchrome-ec-3d686709f0a13f406941e2b8c68a11683fe971b1.tar.gz
buddy: Implement LED control.
Implement LED control for buddy. BUG=none BRANCH=none TEST=check LED behavior is correct. Change-Id: I40a22994fa0aeeae027b200ed162d4c450b2389c Signed-off-by: Grover Yen <Grover_Yen@wistron.com> Reviewed-on: https://chromium-review.googlesource.com/294006 Reviewed-by: Mohammed Habibulla <moch@google.com>
-rw-r--r--board/buddy/gpio.inc5
-rw-r--r--board/buddy/led.c78
2 files changed, 7 insertions, 76 deletions
diff --git a/board/buddy/gpio.inc b/board/buddy/gpio.inc
index 68e10751c0..72aa2578d5 100644
--- a/board/buddy/gpio.inc
+++ b/board/buddy/gpio.inc
@@ -83,10 +83,7 @@ GPIO(PCH_SUSACK_L, F, 3, GPIO_OUT_HIGH, NULL) /* Acknowledge PCH SUSWARN
GPIO(PCH_RTCRST_L, F, 6, GPIO_ODR_HIGH, NULL) /* Not supposed to be here */
GPIO(PCH_SRTCRST_L, F, 7, GPIO_ODR_HIGH, NULL) /* Not supposed to be here */
-GPIO(BAT_LED0_L, D, 0, GPIO_ODR_HIGH, NULL) /* Battery charging LED - blue */
-GPIO(BAT_LED1_L, N, 4, GPIO_ODR_HIGH, NULL) /* Battery charging LED - orange */
-GPIO(PWR_LED0_L, D, 1, GPIO_ODR_HIGH, NULL) /* Power LED - blue */
-GPIO(PWR_LED1_L, N, 6, GPIO_ODR_HIGH, NULL) /* Power LED - orange */
+GPIO(PWR_LED0_L, N, 6, GPIO_ODR_HIGH, NULL) /* Power LED - blue */
ALTERNATE(A, 0x03, 1, MODULE_UART, GPIO_PULL_UP) /* UART0 */
ALTERNATE(B, 0x04, 3, MODULE_I2C, 0) /* I2C0 SCL */
diff --git a/board/buddy/led.c b/board/buddy/led.c
index 199da7600c..227934d36a 100644
--- a/board/buddy/led.c
+++ b/board/buddy/led.c
@@ -21,37 +21,23 @@
enum led_color {
LED_OFF = 0,
LED_BLUE,
- LED_AMBER,
- LED_PINK,
-
LED_COLOR_COUNT /* Number of colors, not a color itself */
};
const enum ec_led_id supported_led_ids[] = {
- EC_LED_ID_POWER_LED, EC_LED_ID_BATTERY_LED};
+ EC_LED_ID_POWER_LED};
const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
static int buddy_led_set_gpio(enum led_color color,
- enum gpio_signal gpio_led_blue_l,
- enum gpio_signal gpio_led_amber_l)
+ enum gpio_signal gpio_led_blue_l)
{
switch (color) {
case LED_OFF:
gpio_set_level(gpio_led_blue_l, 1);
- gpio_set_level(gpio_led_amber_l, 1);
break;
case LED_BLUE:
gpio_set_level(gpio_led_blue_l, 0);
- gpio_set_level(gpio_led_amber_l, 1);
- break;
- case LED_AMBER:
- gpio_set_level(gpio_led_blue_l, 1);
- gpio_set_level(gpio_led_amber_l, 0);
- break;
- case LED_PINK:
- gpio_set_level(gpio_led_blue_l, 0);
- gpio_set_level(gpio_led_amber_l, 0);
break;
default:
return EC_ERROR_UNKNOWN;
@@ -59,14 +45,9 @@ static int buddy_led_set_gpio(enum led_color color,
return EC_SUCCESS;
}
-static int buddy_led_set_color_battery(enum led_color color)
-{
- return buddy_led_set_gpio(color, GPIO_BAT_LED0_L, GPIO_BAT_LED1_L);
-}
-
static int buddy_led_set_color_power(enum led_color color)
{
- return buddy_led_set_gpio(color, GPIO_PWR_LED0_L, GPIO_PWR_LED1_L);
+ return buddy_led_set_gpio(color, GPIO_PWR_LED0_L);
}
static int buddy_led_set_color(enum ec_led_id led_id, enum led_color color)
@@ -75,9 +56,6 @@ static int buddy_led_set_color(enum ec_led_id led_id, enum led_color color)
led_auto_control(led_id, 0);
switch (led_id) {
- case EC_LED_ID_BATTERY_LED:
- rv = buddy_led_set_color_battery(color);
- break;
case EC_LED_ID_POWER_LED:
rv = buddy_led_set_color_power(color);
break;
@@ -89,13 +67,8 @@ static int buddy_led_set_color(enum ec_led_id led_id, enum led_color color)
int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
{
- if (brightness[EC_LED_COLOR_BLUE] != 0 &&
- brightness[EC_LED_COLOR_YELLOW] != 0)
- buddy_led_set_color(led_id, LED_PINK);
- else if (brightness[EC_LED_COLOR_BLUE] != 0)
+ if (brightness[EC_LED_COLOR_BLUE] != 0)
buddy_led_set_color(led_id, LED_BLUE);
- else if (brightness[EC_LED_COLOR_YELLOW] != 0)
- buddy_led_set_color(led_id, LED_AMBER);
else
buddy_led_set_color(led_id, LED_OFF);
@@ -106,7 +79,6 @@ void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range)
{
/* Ignoring led_id as both leds support the same colors */
brightness_range[EC_LED_COLOR_BLUE] = 1;
- brightness_range[EC_LED_COLOR_YELLOW] = 1;
}
static void buddy_led_set_power(void)
@@ -117,7 +89,7 @@ static void buddy_led_set_power(void)
power_ticks++;
if (chipset_in_state(CHIPSET_STATE_SUSPEND)) {
- /* Reset ticks if entering suspend so LED turns amber
+ /* Reset ticks if entering suspend so LED turns blue
* as soon as possible. */
if (!previous_state_suspend)
power_ticks = 0;
@@ -125,7 +97,7 @@ static void buddy_led_set_power(void)
/* Blink once every four seconds. */
buddy_led_set_color_power(
(power_ticks % LED_TOTAL_TICKS < LED_ON_TICKS) ?
- LED_AMBER : LED_OFF);
+ LED_BLUE : LED_OFF);
previous_state_suspend = 1;
return;
@@ -139,48 +111,10 @@ static void buddy_led_set_power(void)
buddy_led_set_color_power(LED_BLUE);
}
-static void buddy_led_set_battery(void)
-{
- static int battery_ticks;
- uint32_t chflags = charge_get_flags();
-
- battery_ticks++;
-
- switch (charge_get_state()) {
- case PWR_STATE_CHARGE:
- buddy_led_set_color_battery(LED_AMBER);
- break;
- case PWR_STATE_CHARGE_NEAR_FULL:
- buddy_led_set_color_battery(LED_BLUE);
- break;
- case PWR_STATE_DISCHARGE:
- buddy_led_set_color_battery(LED_OFF);
- break;
- case PWR_STATE_ERROR:
- buddy_led_set_color_battery(
- (battery_ticks % LED_TOTAL_TICKS < LED_ON_TICKS) ?
- LED_AMBER : LED_OFF);
- break;
- case PWR_STATE_IDLE: /* External power connected in IDLE. */
- if (chflags & CHARGE_FLAG_FORCE_IDLE)
- buddy_led_set_color_battery(
- (battery_ticks & 0x4) ? LED_BLUE : LED_OFF);
- else
- buddy_led_set_color_battery(LED_BLUE);
- break;
- default:
- /* Other states don't alter LED behavior */
- break;
- }
-}
-
/* Called by hook task every 250mSec */
static void led_tick(void)
{
if (led_auto_control_is_enabled(EC_LED_ID_POWER_LED))
buddy_led_set_power();
-
- if (led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED))
- buddy_led_set_battery();
}
DECLARE_HOOK(HOOK_TICK, led_tick, HOOK_PRIO_DEFAULT);