diff options
| -rw-r--r-- | board/reef/board.h | 6 | ||||
| -rw-r--r-- | board/reef/build.mk | 2 | ||||
| -rw-r--r-- | board/reef/gpio.inc | 6 | ||||
| -rw-r--r-- | board/reef/led.c | 159 |
4 files changed, 164 insertions, 9 deletions
diff --git a/board/reef/board.h b/board/reef/board.h index 541eada0c6..9dc2f318af 100644 --- a/board/reef/board.h +++ b/board/reef/board.h @@ -87,7 +87,7 @@ #define CONFIG_I2C_MASTER #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_KEYBOARD_COL2_INVERTED -/* #define CONFIG_LED_COMMON */ +#define CONFIG_LED_COMMON #define CONFIG_LID_SWITCH /* #define CONFIG_LOW_POWER_IDLE */ #define CONFIG_LTO @@ -119,10 +119,6 @@ * to change some other setting to put them in GPIO mode? */ #define NPCX_TACH_SEL2 0 /* 0:GPIO40/A4 1:GPIO93/D3 as TACH */ -/* LED signals */ -#define GPIO_BAT_LED_RED GPIO_CHARGE_LED_1 -#define GPIO_BAT_LED_GREEN GPIO_CHARGE_LED_2 - /* I2C ports */ #define I2C_PORT_GYRO NPCX_I2C_PORT1 #define I2C_PORT_LID_ACCEL NPCX_I2C_PORT2 diff --git a/board/reef/build.mk b/board/reef/build.mk index d7db8dd66d..728d027803 100644 --- a/board/reef/build.mk +++ b/board/reef/build.mk @@ -9,6 +9,6 @@ CHIP:=npcx CHIP_VARIANT:=npcx5m6g -board-y=board.o +board-y=board.o led.o board-$(CONFIG_BATTERY_SMART)+=battery.o board-$(CONFIG_USB_POWER_DELIVERY)+=usb_pd_policy.o diff --git a/board/reef/gpio.inc b/board/reef/gpio.inc index c46f1c579b..893a10e491 100644 --- a/board/reef/gpio.inc +++ b/board/reef/gpio.inc @@ -148,6 +148,9 @@ GPIO(USB_C1_5V_EN, PIN(D, 2), GPIO_OUT_LOW) /* EN_USB_C1_5V_OUT, Enable C1 */ GPIO(NC1, PIN(8, 4), GPIO_INPUT | GPIO_PULL_UP | GPIO_SEL_1P8V) GPIO(NC2, PIN(8, 4), GPIO_INPUT | GPIO_PULL_UP | GPIO_SEL_1P8V) +GPIO(BAT_LED_BLUE, PIN(8, 0), GPIO_OUT_HIGH) +GPIO(BAT_LED_AMBER, PIN(C, 4), GPIO_OUT_HIGH) + /* * Alternate function pins */ @@ -172,8 +175,5 @@ ALTERNATE(PIN_MASK(B, 0x0C), 1, MODULE_I2C, 0) /* GPOPB3-B2 for EC_I2C_USB_C1_PD ALTERNATE(PIN_MASK(8, 0x80), 1, MODULE_I2C, 0) /* GPIO87 for EC_I2C_POWER_SDA */ ALTERNATE(PIN_MASK(9, 0x01), 1, MODULE_I2C, 0) /* GPIO90 for EC_I2C_POWER_SCL */ -ALTERNATE(PIN(8, 0), 4, MODULE_PWM, 0) /* RED_LED (PWM3) */ -GPIO(GPIO_GREEN_LED, PIN(C, 4), GPIO_INPUT) - /* FIXME: Make UART RX an interrupt? */ ALTERNATE(PIN_MASK(6, 0x30), 0, MODULE_UART, 0) /* UART from EC to Servo */ diff --git a/board/reef/led.c b/board/reef/led.c new file mode 100644 index 0000000000..2380366d85 --- /dev/null +++ b/board/reef/led.c @@ -0,0 +1,159 @@ +/* Copyright 2016 The Chromium OS Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + * + * Power and battery LED control for Amenia. + */ + +#include "battery.h" +#include "charge_state.h" +#include "chipset.h" +#include "ec_commands.h" +#include "gpio.h" +#include "hooks.h" +#include "host_command.h" +#include "led_common.h" +#include "util.h" + +#define BAT_LED_ON 0 +#define BAT_LED_OFF 1 + +#define CRITICAL_LOW_BATTERY_PERCENTAGE 3 +#define LOW_BATTERY_PERCENTAGE 10 + +#define LED_TOTAL_4SECS_TICKS 4 +#define LED_TOTAL_2SECS_TICKS 2 +#define LED_ON_1SEC_TICKS 1 +#define LED_ON_2SECS_TICKS 2 + +const enum ec_led_id supported_led_ids[] = { + EC_LED_ID_BATTERY_LED}; + +const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids); + +enum led_color { + LED_OFF = 0, + LED_BLUE, + LED_AMBER, + LED_COLOR_COUNT /* Number of colors, not a color itself */ +}; + +static int bat_led_set_color(enum led_color color) +{ + switch (color) { + case LED_OFF: + gpio_set_level(GPIO_BAT_LED_BLUE, BAT_LED_OFF); + gpio_set_level(GPIO_BAT_LED_AMBER, BAT_LED_OFF); + break; + case LED_BLUE: + gpio_set_level(GPIO_BAT_LED_BLUE, BAT_LED_ON); + gpio_set_level(GPIO_BAT_LED_AMBER, BAT_LED_OFF); + break; + case LED_AMBER: + gpio_set_level(GPIO_BAT_LED_BLUE, BAT_LED_OFF); + gpio_set_level(GPIO_BAT_LED_AMBER, 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_BLUE] = 1; + brightness_range[EC_LED_COLOR_AMBER] = 1; +} + +static int led_set_color_battery(enum led_color color) +{ + return bat_led_set_color(color); +} + +static int led_set_color(enum ec_led_id led_id, enum led_color color) +{ + int rv; + + led_auto_control(led_id, 0); + 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_BLUE] != 0) + led_set_color(led_id, LED_BLUE); + else if (brightness[EC_LED_COLOR_AMBER] != 0) + led_set_color(led_id, LED_AMBER); + else + led_set_color(led_id, LED_OFF); + + return EC_SUCCESS; +} + +static void led_set_battery(void) +{ + static int battery_ticks; + uint32_t chflags = charge_get_flags(); + + battery_ticks++; + + /* BAT LED behavior: + * Same as the chromeos spec + * Green/Amber for CHARGE_FLAG_FORCE_IDLE + */ + switch (charge_get_state()) { + case PWR_STATE_CHARGE: + led_set_color_battery(LED_AMBER); + break; + case PWR_STATE_DISCHARGE: + /* Less than 3%, blink one second every two second */ + if (!chipset_in_state(CHIPSET_STATE_ANY_OFF) && + charge_get_percent() < CRITICAL_LOW_BATTERY_PERCENTAGE) + led_set_color_battery( + (battery_ticks % LED_TOTAL_2SECS_TICKS < + LED_ON_1SEC_TICKS) ? LED_AMBER : LED_OFF); + /* Less than 10%, blink one second every four seconds */ + else if (!chipset_in_state(CHIPSET_STATE_ANY_OFF) && + charge_get_percent() < LOW_BATTERY_PERCENTAGE) + led_set_color_battery( + (battery_ticks % LED_TOTAL_4SECS_TICKS < + LED_ON_1SEC_TICKS) ? LED_AMBER : LED_OFF); + else + led_set_color_battery(LED_OFF); + break; + case PWR_STATE_ERROR: + led_set_color_battery( + (battery_ticks % LED_TOTAL_2SECS_TICKS < + LED_ON_1SEC_TICKS) ? LED_AMBER : LED_OFF); + break; + case PWR_STATE_CHARGE_NEAR_FULL: + led_set_color_battery(LED_BLUE); + break; + case PWR_STATE_IDLE: /* External power connected in IDLE */ + if (chflags & CHARGE_FLAG_FORCE_IDLE) + led_set_color_battery( + (battery_ticks % LED_TOTAL_4SECS_TICKS < + LED_ON_2SECS_TICKS) ? LED_AMBER : LED_BLUE); + else + led_set_color_battery(LED_BLUE); + break; + default: + /* Other states don't alter LED behavior */ + break; + } +} + +/** * Called by hook task every 1 sec */ +static void led_second(void) +{ + if (led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED)) + led_set_battery(); +} +DECLARE_HOOK(HOOK_SECOND, led_second, HOOK_PRIO_DEFAULT); |