diff options
| author | Jeff Chase <jnchase@google.com> | 2020-03-13 14:04:09 -0400 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-03-14 06:41:57 +0000 |
| commit | ae56c680adeba3cea589d45788d77f186c2f8fbe (patch) | |
| tree | da7793cbafc0276aa1a94da2f186fd6657d51472 /board/endeavour | |
| parent | bf4058effbfe8a0bd8d840ca67d3ff17d7e2ff5e (diff) | |
| download | chrome-ec-ae56c680adeba3cea589d45788d77f186c2f8fbe.tar.gz | |
endeavour: ensure correct led state on init
Also remove dead led_alert() code since this board does not use USB-C
power.
BUG=b:151172843
BRANCH=none
TEST=various reboots, power cycles, and suspends
Signed-off-by: Jeff Chase <jnchase@google.com>
Change-Id: I60ab17e0bfc15731005ae81682e0cde9fff3f8d2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2103050
Reviewed-by: Diana Z <dzigterman@chromium.org>
Diffstat (limited to 'board/endeavour')
| -rw-r--r-- | board/endeavour/board.h | 1 | ||||
| -rw-r--r-- | board/endeavour/led.c | 28 |
2 files changed, 8 insertions, 21 deletions
diff --git a/board/endeavour/board.h b/board/endeavour/board.h index 5dae255681..19395732c1 100644 --- a/board/endeavour/board.h +++ b/board/endeavour/board.h @@ -147,7 +147,6 @@ enum OEM_ID { }; /* Board specific handlers */ -void led_alert(int enable); void show_critical_error(void); #endif /* !__ASSEMBLER__ */ diff --git a/board/endeavour/led.c b/board/endeavour/led.c index 77cd566ee5..b75de503e5 100644 --- a/board/endeavour/led.c +++ b/board/endeavour/led.c @@ -150,25 +150,15 @@ static void led_init(void) { pwm_enable(PWM_CH_LED_RED, 1); pwm_enable(PWM_CH_LED_WHITE, 1); -} -DECLARE_HOOK(HOOK_INIT, led_init, HOOK_PRIO_INIT_PWM + 1); -void led_alert(int enable) -{ - if (enable) { - /* Overwrite the current signal */ - config_tick(1 * SECOND, 100, LED_RED); - led_tick(); - } else { - /* Restore the previous signal */ - if (chipset_in_state(CHIPSET_STATE_ON)) - led_resume(); - else if (chipset_in_state(CHIPSET_STATE_SUSPEND)) - led_suspend(); - else if (chipset_in_state(CHIPSET_STATE_ANY_OFF)) - led_shutdown(); - } + if (chipset_in_state(CHIPSET_STATE_ON)) + led_resume(); + else if (chipset_in_state(CHIPSET_STATE_ANY_SUSPEND)) + led_suspend(); + else if (chipset_in_state(CHIPSET_STATE_ANY_OFF)) + led_shutdown(); } +DECLARE_HOOK(HOOK_INIT, led_init, HOOK_PRIO_DEFAULT); void show_critical_error(void) { @@ -193,8 +183,6 @@ static int command_led(int argc, char **argv) set_color(id, LED_RED, 100); } else if (!strcasecmp(argv[1], "white")) { set_color(id, LED_WHITE, 100); - } else if (!strcasecmp(argv[1], "alert")) { - led_alert(1); } else if (!strcasecmp(argv[1], "crit")) { show_critical_error(); } else { @@ -203,7 +191,7 @@ static int command_led(int argc, char **argv) return EC_SUCCESS; } DECLARE_CONSOLE_COMMAND(led, command_led, - "[debug|red|white|off|alert|crit]", + "[debug|red|white|off|crit]", "Turn on/off LED."); void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range) |