From 4e65dfbc00b2b75a3436bb69148ca722d58b5252 Mon Sep 17 00:00:00 2001 From: Zick Wei Date: Fri, 31 Jul 2020 13:44:52 +0800 Subject: dirinboz: add LED behavior dirinboz have two charging leds on left side and right side. each side have two colors amber and white. The led behavior define as following: Charging led: led on with charging port active, other port is off. Charging: Amber. Discharging: Off. Battery Error: Blinking white (0.4 sec on, 0.4 sec off) Fuel < 10%: Blinking white on right side port (1 sec on, 1 sec off) Force idle for factory: Blinking amber (1 sec on, 1 sec off) System suspend with non-charging state: Blinking both side LED white (1 sec on, 1 sec off) BUG=none BRANCH=none TEST=make sure led behavior intended. make sure ectool led left white/amber/off/auto work correctly. make sure ectool led right white/amber/off/auto work correctly. Signed-off-by: Zick Wei Change-Id: I3a182b1608554cf82fdb3b76917c01321d8d473d Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2331983 Reviewed-by: Edward Hill Commit-Queue: Edward Hill --- board/dirinboz/board.h | 4 +- board/dirinboz/gpio.inc | 4 +- board/dirinboz/led.c | 224 ++++++++++++++++++++++++++++++++++-------------- 3 files changed, 165 insertions(+), 67 deletions(-) diff --git a/board/dirinboz/board.h b/board/dirinboz/board.h index 25af2d988d..2538918873 100644 --- a/board/dirinboz/board.h +++ b/board/dirinboz/board.h @@ -28,8 +28,8 @@ #define GPIO_USB1_ILIM_SEL IOEX_USB_A0_CHARGE_EN_L #define GPIO_USB2_ILIM_SEL IOEX_USB_A1_CHARGE_EN_DB_L -/* Power LEDs */ -#define CONFIG_LED_POWER_LED +/* LED */ +#undef CONFIG_LED_ONOFF_STATES /* Motion sensing drivers */ #define CONFIG_ACCELGYRO_LSM6DSM diff --git a/board/dirinboz/gpio.inc b/board/dirinboz/gpio.inc index 4b3f58f602..042ae7fe4f 100644 --- a/board/dirinboz/gpio.inc +++ b/board/dirinboz/gpio.inc @@ -53,7 +53,6 @@ UNIMPLEMENTED(PCH_SMI_L) GPIO(LED_FULL_L, PIN(6, 0), GPIO_OUT_HIGH) GPIO(LED_CHRG_L, PIN(C, 0), GPIO_OUT_HIGH) -GPIO(LED3_PWM, PIN(C, 3), GPIO_OUT_HIGH) /* * Dirinboz has 1 DB options. @@ -79,6 +78,9 @@ IOEX(USB_C1_PPC_EN_L, EXPIN(IOEX_C1_NCT3807, 1, 3), GPIO_OUT_LOW) /* C1 PPC Ena IOEX(USB_C1_DATA_EN, EXPIN(IOEX_C1_NCT3807, 1, 5), GPIO_OUT_HIGH) /* C1 Retimer Enable */ IOEX(EN_USB_A1_5V_DB, EXPIN(IOEX_C1_NCT3807, 1, 6), GPIO_OUT_LOW) /* A1 5V Source Enable */ IOEX(USB_A1_CHARGE_EN_DB_L,EXPIN(IOEX_C1_NCT3807, 1, 7), GPIO_OUT_HIGH) /* A1 5V High Current Enable */ +IOEX(C1_CHARGER_LED_WHITE_DB,EXPIN(IOEX_C1_NCT3807, 1, 0), GPIO_OUT_HIGH) /* C1 Charge LED White */ +IOEX(C1_CHARGER_LED_AMBER_DB,EXPIN(IOEX_C1_NCT3807, 1, 4), GPIO_OUT_HIGH) /* C1 Charge LED Amber */ + /* * The NPCX LPC driver configures and controls SCI, so PCH_SCI_ODL [PIN(7, 6)] diff --git a/board/dirinboz/led.c b/board/dirinboz/led.c index 751305c184..624277d209 100644 --- a/board/dirinboz/led.c +++ b/board/dirinboz/led.c @@ -3,103 +3,199 @@ * found in the LICENSE file. */ +#include "battery.h" +#include "charge_manager.h" +#include "charge_state.h" +#include "chipset.h" #include "ec_commands.h" #include "gpio.h" +#include "host_command.h" #include "led_common.h" -#include "led_onoff_states.h" - -#define LED_OFF_LVL 1 -#define LED_ON_LVL 0 - -const int led_charge_lvl_1; -const int led_charge_lvl_2 = 100; - -struct led_descriptor led_bat_state_table[LED_NUM_STATES][LED_NUM_PHASES] = { - [STATE_CHARGING_LVL_1] = {{EC_LED_COLOR_GREEN, 2 * LED_ONE_SEC}, - {EC_LED_COLOR_RED, 2 * LED_ONE_SEC} }, - [STATE_CHARGING_LVL_2] = {{EC_LED_COLOR_RED, LED_INDEFINITE} }, - [STATE_CHARGING_FULL_CHARGE] = {{EC_LED_COLOR_GREEN, LED_INDEFINITE} }, - [STATE_DISCHARGE_S0] = {{EC_LED_COLOR_GREEN, LED_INDEFINITE} }, - [STATE_DISCHARGE_S3] = {{EC_LED_COLOR_RED, 1 * LED_ONE_SEC}, - {LED_OFF, 3 * LED_ONE_SEC} }, - [STATE_DISCHARGE_S5] = {{LED_OFF, LED_INDEFINITE} }, - [STATE_BATTERY_ERROR] = {{EC_LED_COLOR_GREEN, 2 * LED_ONE_SEC}, - {EC_LED_COLOR_RED, 2 * LED_ONE_SEC} }, - [STATE_FACTORY_TEST] = {{EC_LED_COLOR_GREEN, LED_INDEFINITE} }, -}; +#include "hooks.h" -BUILD_ASSERT(ARRAY_SIZE(led_bat_state_table) == LED_NUM_STATES); +#define BAT_LED_ON 0 +#define BAT_LED_OFF 1 -const struct led_descriptor - led_pwr_state_table[PWR_LED_NUM_STATES][LED_NUM_PHASES] = { - [PWR_LED_STATE_ON] = {{EC_LED_COLOR_WHITE, LED_INDEFINITE} }, - [PWR_LED_STATE_SUSPEND_AC] = {{EC_LED_COLOR_WHITE, 3 * LED_ONE_SEC}, - {LED_OFF, 0.5 * LED_ONE_SEC} }, - [PWR_LED_STATE_SUSPEND_NO_AC] = {{LED_OFF, LED_INDEFINITE} }, - [PWR_LED_STATE_OFF] = {{LED_OFF, LED_INDEFINITE} }, -}; +#define POWER_LED_ON 0 +#define POWER_LED_OFF 1 -BUILD_ASSERT(ARRAY_SIZE(led_pwr_state_table) == PWR_LED_NUM_STATES); +#define LED_TICKS_PER_CYCLE 10 +#define LED_ON_TICKS 5 const enum ec_led_id supported_led_ids[] = { - EC_LED_ID_BATTERY_LED, - EC_LED_ID_POWER_LED + EC_LED_ID_LEFT_LED, + EC_LED_ID_RIGHT_LED, }; const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids); -void led_set_color_power(enum ec_led_colors color) -{ - if (color == EC_LED_COLOR_WHITE) - gpio_set_level(GPIO_LED3_PWM, LED_ON_LVL); - else - /* LED_OFF and unsupported colors */ - gpio_set_level(GPIO_LED3_PWM, LED_OFF_LVL); -} +enum led_color { + LED_OFF = 0, + LED_AMBER, + LED_WHITE, + LED_COLOR_COUNT /* Number of colors, not a color itself */ +}; -void led_set_color_battery(enum ec_led_colors color) +enum led_port { + LEFT_PORT = 0, + RIGHT_PORT +}; + +static void led_set_color_battery(int port, enum led_color color) { + enum gpio_signal amber_led, white_led; + + amber_led = (port == LEFT_PORT ? GPIO_LED_CHRG_L : + IOEX_C1_CHARGER_LED_AMBER_DB); + white_led = (port == LEFT_PORT ? GPIO_LED_FULL_L : + IOEX_C1_CHARGER_LED_WHITE_DB); + switch (color) { - case EC_LED_COLOR_GREEN: - gpio_set_level(GPIO_LED_FULL_L, LED_ON_LVL); - gpio_set_level(GPIO_LED_CHRG_L, LED_OFF_LVL); + case LED_WHITE: + gpio_or_ioex_set_level(white_led, BAT_LED_ON); + gpio_or_ioex_set_level(amber_led, BAT_LED_OFF); break; - case EC_LED_COLOR_RED: - gpio_set_level(GPIO_LED_FULL_L, LED_OFF_LVL); - gpio_set_level(GPIO_LED_CHRG_L, LED_ON_LVL); + case LED_AMBER: + gpio_or_ioex_set_level(white_led, BAT_LED_OFF); + gpio_or_ioex_set_level(amber_led, BAT_LED_ON); break; - default: /* LED_OFF and other unsupported colors */ - gpio_set_level(GPIO_LED_FULL_L, LED_OFF_LVL); - gpio_set_level(GPIO_LED_CHRG_L, LED_OFF_LVL); + case LED_OFF: + gpio_or_ioex_set_level(white_led, BAT_LED_OFF); + gpio_or_ioex_set_level(amber_led, BAT_LED_OFF); + break; + default: break; } } void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range) { - if (led_id == EC_LED_ID_BATTERY_LED) { - brightness_range[EC_LED_COLOR_GREEN] = 1; - brightness_range[EC_LED_COLOR_RED] = 1; - } else if (led_id == EC_LED_ID_POWER_LED) { + switch (led_id) { + case EC_LED_ID_LEFT_LED: + brightness_range[EC_LED_COLOR_WHITE] = 1; + brightness_range[EC_LED_COLOR_AMBER] = 1; + break; + case EC_LED_ID_RIGHT_LED: brightness_range[EC_LED_COLOR_WHITE] = 1; + brightness_range[EC_LED_COLOR_AMBER] = 1; + break; + default: + break; } } int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness) { - if (led_id == EC_LED_ID_BATTERY_LED) { - if (brightness[EC_LED_COLOR_GREEN] != 0) - led_set_color_battery(EC_LED_COLOR_GREEN); - else if (brightness[EC_LED_COLOR_RED] != 0) - led_set_color_battery(EC_LED_COLOR_RED); + switch (led_id) { + case EC_LED_ID_LEFT_LED: + if (brightness[EC_LED_COLOR_WHITE] != 0) + led_set_color_battery(LEFT_PORT, LED_WHITE); + else if (brightness[EC_LED_COLOR_AMBER] != 0) + led_set_color_battery(LEFT_PORT, LED_AMBER); else - led_set_color_battery(LED_OFF); - } else if (led_id == EC_LED_ID_POWER_LED) { + led_set_color_battery(LEFT_PORT, LED_OFF); + break; + case EC_LED_ID_RIGHT_LED: if (brightness[EC_LED_COLOR_WHITE] != 0) - led_set_color_power(EC_LED_COLOR_WHITE); + led_set_color_battery(RIGHT_PORT, LED_WHITE); + else if (brightness[EC_LED_COLOR_AMBER] != 0) + led_set_color_battery(RIGHT_PORT, LED_AMBER); else - led_set_color_power(LED_OFF); + led_set_color_battery(RIGHT_PORT, LED_OFF); + break; + default: + return EC_ERROR_PARAM1; } return EC_SUCCESS; } + +/* + * Set active charge port color to the parameter, turn off all others. + * If no port is active (-1), turn off all LEDs. + */ +static void set_active_port_color(enum led_color color) +{ + int port = charge_manager_get_active_charge_port(); + + if (led_auto_control_is_enabled(EC_LED_ID_RIGHT_LED)) + led_set_color_battery(RIGHT_PORT, + (port == RIGHT_PORT) ? color : LED_OFF); + if (led_auto_control_is_enabled(EC_LED_ID_LEFT_LED)) + led_set_color_battery(LEFT_PORT, + (port == LEFT_PORT) ? color : LED_OFF); +} + +static void led_set_battery(void) +{ + static int battery_ticks; + static int power_ticks; + uint32_t chflags = charge_get_flags(); + + battery_ticks++; + + /* + * Override battery LEDs for Berknip, Berknip is non-power LED + * design, blinking both two side battery white LEDs to indicate + * system suspend with non-charging state. + */ + if (chipset_in_state(CHIPSET_STATE_SUSPEND | + CHIPSET_STATE_STANDBY) && + charge_get_state() != PWR_STATE_CHARGE) { + + power_ticks++; + + led_set_color_battery(RIGHT_PORT, power_ticks & 0x4 ? + LED_WHITE : LED_OFF); + led_set_color_battery(LEFT_PORT, power_ticks & 0x4 ? + LED_WHITE : LED_OFF); + return; + } + + power_ticks = 0; + + switch (charge_get_state()) { + case PWR_STATE_CHARGE: + /* Always indicate when charging, even in suspend. */ + set_active_port_color(LED_AMBER); + break; + case PWR_STATE_DISCHARGE: + if (led_auto_control_is_enabled(EC_LED_ID_RIGHT_LED)) { + if (charge_get_percent() < 10) + led_set_color_battery(RIGHT_PORT, + (battery_ticks % LED_TICKS_PER_CYCLE + < LED_ON_TICKS) ? LED_WHITE : LED_OFF); + else + led_set_color_battery(RIGHT_PORT, LED_OFF); + } + + if (led_auto_control_is_enabled(EC_LED_ID_LEFT_LED)) + led_set_color_battery(LEFT_PORT, LED_OFF); + break; + case PWR_STATE_ERROR: + set_active_port_color((battery_ticks & 0x2) ? + LED_WHITE : LED_OFF); + break; + case PWR_STATE_CHARGE_NEAR_FULL: + set_active_port_color(LED_WHITE); + break; + case PWR_STATE_IDLE: /* External power connected in IDLE */ + if (chflags & CHARGE_FLAG_FORCE_IDLE) + set_active_port_color((battery_ticks % + LED_TICKS_PER_CYCLE < LED_ON_TICKS) ? + LED_AMBER : LED_OFF); + else + set_active_port_color(LED_WHITE); + break; + default: + /* Other states don't alter LED behavior */ + break; + } +} + +/* Called by hook task every TICK */ +static void led_tick(void) +{ + led_set_battery(); +} +DECLARE_HOOK(HOOK_TICK, led_tick, HOOK_PRIO_DEFAULT); -- cgit v1.2.1