diff options
| -rw-r--r-- | board/kappa/board.c | 7 | ||||
| -rw-r--r-- | board/kappa/board.h | 18 | ||||
| -rw-r--r-- | board/kappa/gpio.inc | 3 | ||||
| -rw-r--r-- | board/kappa/led.c | 150 |
4 files changed, 126 insertions, 52 deletions
diff --git a/board/kappa/board.c b/board/kappa/board.c index be01e2c177..6f4628ab8a 100644 --- a/board/kappa/board.c +++ b/board/kappa/board.c @@ -125,13 +125,6 @@ const struct pi3usb9201_config_t pi3usb9201_bc12_chips[] = { .i2c_addr_flags = PI3USB9201_I2C_ADDR_3_FLAGS, }, }; -/******************************************************************************/ -const struct it8801_pwm_t it8801_pwm_channels[] = { - [PWM_CH_LED_AMBER] = { 1 }, - [PWM_LED_NO_CHANNEL] = { -1 }, - [PWM_CH_LED_WHITE] = { 3 }, -}; -BUILD_ASSERT(ARRAY_SIZE(it8801_pwm_channels) == PWM_CH_COUNT); /******************************************************************************/ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { diff --git a/board/kappa/board.h b/board/kappa/board.h index 99da5f17dd..8cc3aefd8c 100644 --- a/board/kappa/board.h +++ b/board/kappa/board.h @@ -96,17 +96,6 @@ #define PD_OPERATING_POWER_MW 30000 -#undef CONFIG_LED_PWM_NEAR_FULL_COLOR -#undef CONFIG_LED_PWM_CHARGE_ERROR_COLOR - -#define CONFIG_LED_PWM_NEAR_FULL_COLOR EC_LED_COLOR_WHITE -#define CONFIG_LED_PWM_CHARGE_ERROR_COLOR EC_LED_COLOR_WHITE - -#define CONFIG_LED_PWM -#define CONFIG_LED_PWM_CHARGE_STATE_ONLY -#define CONFIG_IO_EXPANDER_IT8801_PWM -#define CONFIG_LED_PWM_COUNT 1 - #ifndef __ASSEMBLER__ enum adc_channel { @@ -147,13 +136,6 @@ enum battery_type { BATTERY_TYPE_COUNT, }; -enum pwm_channel { - PWM_CH_LED_AMBER, - PWM_LED_NO_CHANNEL, - PWM_CH_LED_WHITE, - PWM_CH_COUNT -}; - #include "gpio_signal.h" #include "registers.h" diff --git a/board/kappa/gpio.inc b/board/kappa/gpio.inc index 2145cbf1c0..60cf796f46 100644 --- a/board/kappa/gpio.inc +++ b/board/kappa/gpio.inc @@ -84,6 +84,9 @@ GPIO(BOOTBLOCK_EN_L, PIN(C, 1), GPIO_ODR_HIGH) GPIO(EN_PP1800_S5_L, PIN(A, 14), GPIO_OUT_LOW) GPIO(USB_C0_DISCHARGE, PIN(B, 6), GPIO_OUT_LOW) +IOEX(BAT_LED_AMBER_L, EXPIN(0, 1, 2), GPIO_OUT_HIGH) +IOEX(BAT_LED_WHITE_L, EXPIN(0, 1, 4), GPIO_OUT_HIGH) + /* * TODO(b:138352732): On IT88801 expander, To be readded once IT8801 driver and * gpio expander framework has landed. diff --git a/board/kappa/led.c b/board/kappa/led.c index de4eca8bbf..5b65d7b948 100644 --- a/board/kappa/led.c +++ b/board/kappa/led.c @@ -5,47 +5,143 @@ * Power and battery LED control for Kappa */ -#include "common.h" -#include "driver/ioexpander/it8801.h" -#include "ec_commands.h" +#include "charge_state.h" +#include "extpower.h" +#include "hooks.h" +#include "ioexpander.h" #include "led_common.h" -#include "led_pwm.h" -const enum ec_led_id supported_led_ids[] = { - EC_LED_ID_POWER_LED, -}; +#define BAT_LED_ON 0 +#define BAT_LED_OFF 1 + +const enum ec_led_id supported_led_ids[] = {EC_LED_ID_BATTERY_LED}; + const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids); -struct pwm_led led_color_map[EC_LED_COLOR_COUNT] = { - [EC_LED_COLOR_AMBER] = {100, 0, 0}, - [EC_LED_COLOR_WHITE] = {0, 0, 100}, +enum led_color { + LED_OFF = 0, + LED_AMBER, + LED_WHITE, + LED_COLOR_COUNT /* Number of colors, not a color itself */ }; -struct pwm_led pwm_leds[CONFIG_LED_PWM_COUNT] = { - [PWM_LED0] = { - .ch0 = PWM_CH_LED_AMBER, - .ch1 = PWM_LED_NO_CHANNEL, - .ch2 = PWM_CH_LED_WHITE, - .enable = &it8801_pwm_enable, - .set_duty = &it8801_pwm_set_duty, - }, -}; +static int led_set_color_battery(enum led_color color) +{ + switch (color) { + case LED_OFF: + ioex_set_level(IOEX_BAT_LED_WHITE_L, BAT_LED_OFF); + ioex_set_level(IOEX_BAT_LED_AMBER_L, BAT_LED_OFF); + break; + case LED_WHITE: + ioex_set_level(IOEX_BAT_LED_WHITE_L, BAT_LED_ON); + ioex_set_level(IOEX_BAT_LED_AMBER_L, BAT_LED_OFF); + break; + case LED_AMBER: + ioex_set_level(IOEX_BAT_LED_WHITE_L, BAT_LED_OFF); + ioex_set_level(IOEX_BAT_LED_AMBER_L, BAT_LED_ON); + break; + default: + return EC_ERROR_UNKNOWN; + } + return EC_SUCCESS; +} void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range) { - brightness_range[EC_LED_COLOR_AMBER] = 100; - brightness_range[EC_LED_COLOR_WHITE] = 100; + brightness_range[EC_LED_COLOR_WHITE] = 1; + brightness_range[EC_LED_COLOR_AMBER] = 1; +} + +static int led_set_color(enum ec_led_id led_id, enum led_color color) +{ + int rv; + + switch (led_id) { + case EC_LED_ID_BATTERY_LED: + rv = led_set_color_battery(color); + break; + default: + return EC_ERROR_UNKNOWN; + } + return rv; } int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness) { - if (brightness[EC_LED_COLOR_AMBER]) - set_pwm_led_color(PWM_LED0, EC_LED_COLOR_AMBER); - else if (brightness[EC_LED_COLOR_WHITE]) - set_pwm_led_color(PWM_LED0, EC_LED_COLOR_WHITE); + if (brightness[EC_LED_COLOR_WHITE] != 0) + led_set_color(led_id, LED_WHITE); + else if (brightness[EC_LED_COLOR_AMBER] != 0) + led_set_color(led_id, LED_AMBER); else - /* Otherwise, the "color" is "off". */ - set_pwm_led_color(PWM_LED0, -1); + led_set_color(led_id, LED_OFF); return EC_SUCCESS; } + +static void led_set_battery(void) +{ + static int battery_ticks; + static int power_ticks; + uint32_t chflags = charge_get_flags(); + + battery_ticks++; + + /* override battery led for system suspend */ + if (chipset_in_state(CHIPSET_STATE_SUSPEND | + CHIPSET_STATE_STANDBY) && + charge_get_state() != PWR_STATE_CHARGE) { + led_set_color_battery(power_ticks++ & 0x2 ? + LED_WHITE : LED_OFF); + return; + } + + power_ticks = 0; + + switch (charge_get_state()) { + case PWR_STATE_CHARGE: + led_set_color_battery(LED_AMBER); + break; + case PWR_STATE_DISCHARGE_FULL: + if (extpower_is_present()) { + led_set_color_battery(LED_WHITE); + break; + } + /* Intentional fall-through */ + case PWR_STATE_DISCHARGE: + /* + * Blink white light (1 sec on, 1 sec off) + * when battery capacity is less than 10% + */ + if (charge_get_percent() < 10) + led_set_color_battery( + (battery_ticks & 0x2) ? LED_WHITE : LED_OFF); + else + led_set_color_battery(LED_OFF); + break; + case PWR_STATE_ERROR: + led_set_color_battery( + (battery_ticks % 0x2) ? LED_WHITE : LED_OFF); + break; + case PWR_STATE_CHARGE_NEAR_FULL: + led_set_color_battery(LED_WHITE); + break; + case PWR_STATE_IDLE: /* External power connected in IDLE */ + if (chflags & CHARGE_FLAG_FORCE_IDLE) + led_set_color_battery( + (battery_ticks & 0x2) ? LED_AMBER : LED_OFF); + else + led_set_color_battery(LED_WHITE); + break; + default: + /* Other states don't alter LED behavior */ + break; + } +} + +/* Called by hook task every TICK */ +static void led_tick(void) +{ + if (led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED)) + led_set_battery(); +} +DECLARE_HOOK(HOOK_TICK, led_tick, HOOK_PRIO_DEFAULT); |