careena: Change LED colors

Careena has non-PWM White/Orange LEDs.

BUG=b:79704826,b:79894166
BRANCH=none
TEST=make -j buildall

Change-Id: Ie85de84fbd6e4ac4c6139d8407a7a25b5f6d5e7e
Signed-off-by: Edward Hill <ecgh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1072898
Reviewed-by: Jett Rink <jettrink@chromium.org>

4 files changed, 147 insertions, 52 deletions

diff --git a/board/careena/board.c b/board/careena/board.c
index 6ead756952..18ef2f8e5f 100644
--- a/board/careena/board.c
+++ b/board/careena/board.c
@@ -112,6 +112,16 @@ const struct i2c_port_t i2c_ports[] = {
 };
 const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
 
+/* PWM channels. Must be in the exactly same order as in enum pwm_channel. */
+const struct pwm_t pwm_channels[] = {
+	[PWM_CH_KBLIGHT] = {
+		.channel = 5,
+		.flags = 0,
+		.freq = 100,
+	},
+};
+BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT);
+
 static void board_init(void)
 {
 	/* Enable Gyro interrupts */
diff --git a/board/careena/board.h b/board/careena/board.h
index 5d1b47e230..c76a3c9b72 100644
--- a/board/careena/board.h
+++ b/board/careena/board.h
@@ -20,20 +20,16 @@
 
 #define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands while in dev. */
 
-/* Power and battery LEDs */
 #define CONFIG_LED_COMMON
 #define CONFIG_CMD_LEDTEST
 
-#undef CONFIG_LED_PWM_NEAR_FULL_COLOR
-#undef CONFIG_LED_PWM_CHARGE_ERROR_COLOR
-#undef CONFIG_LED_PWM_SOC_ON_COLOR
-#undef CONFIG_LED_PWM_SOC_SUSPEND_COLOR
+#ifndef __ASSEMBLER__
 
-#define CONFIG_LED_PWM_NEAR_FULL_COLOR EC_LED_COLOR_BLUE
-#define CONFIG_LED_PWM_CHARGE_ERROR_COLOR EC_LED_COLOR_AMBER
-#define CONFIG_LED_PWM_SOC_ON_COLOR EC_LED_COLOR_BLUE
-#define CONFIG_LED_PWM_SOC_SUSPEND_COLOR EC_LED_COLOR_BLUE
+enum pwm_channel {
+	PWM_CH_KBLIGHT = 0,
+	PWM_CH_COUNT
+};
 
-#define CONFIG_LED_PWM_COUNT 1
+#endif /* !__ASSEMBLER__ */
 
 #endif /* __CROS_EC_BOARD_H */
diff --git a/board/careena/gpio.inc b/board/careena/gpio.inc
index 9341933995..ed7dbb2d21 100644
--- a/board/careena/gpio.inc
+++ b/board/careena/gpio.inc
@@ -44,6 +44,9 @@ GPIO(3AXIS_INT_L,		PIN(5, 0), GPIO_INPUT | GPIO_SEL_1P8V)		/* 3 Axis Accel */
 /* We don't have 5V rail control but the BQ24392 driver expects the GPIO */
 UNIMPLEMENTED(EN_PP5000)
 
+GPIO(BAT_LED_AMBER_L,		PIN(C, 3), GPIO_OUT_HIGH)
+GPIO(BAT_LED_WHITE_L,		PIN(C, 4), GPIO_OUT_HIGH)
+
 /* I2C pins - these will be reconfigured for alternate function below */
 GPIO(I2C0_SCL,			PIN(B, 5), GPIO_INPUT)				/* EC_I2C_POWER_SCL */
 GPIO(I2C0_SDA,			PIN(B, 4), GPIO_INPUT)				/* EC_I2C_POWER_SDA */
@@ -98,7 +101,6 @@ ALTERNATE(PIN_MASK(4, 0x02), 1, MODULE_ADC, 0)					/* ADC4 */
 ALTERNATE(PIN_MASK(F, 0x02), 1, MODULE_ADC, 0)					/* ADC8 */
 ALTERNATE(PIN_MASK(F, 0x01), 1, MODULE_ADC, 0)					/* ADC9 */
 ALTERNATE(PIN_MASK(B, 0x80), 1, MODULE_PWM, 0)					/* KB Backlight */
-ALTERNATE(PIN_MASK(C, 0x18), 1, MODULE_PWM, 0) 					/* LED 1 & 2 */
 
 /* Keyboard Pins */
 ALTERNATE(PIN_MASK(3, 0x03), 0, MODULE_KEYBOARD_SCAN, GPIO_INPUT)		/* KSI_00-01 */
diff --git a/board/careena/led.c b/board/careena/led.c
index fc6f427cd2..4188290b4f 100644
--- a/board/careena/led.c
+++ b/board/careena/led.c
@@ -1,66 +1,153 @@
 /* Copyright 2018 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.
+ *
+ * LED control for Careena
  */
 
-#include "common.h"
+#include "battery.h"
+#include "charge_state.h"
+#include "chipset.h"
 #include "ec_commands.h"
-#include "led_pwm.h"
+#include "extpower.h"
+#include "gpio.h"
+#include "hooks.h"
+#include "host_command.h"
+#include "led_common.h"
 #include "util.h"
+#include "system.h"
+
+#define BAT_LED_ON 0
+#define BAT_LED_OFF 1
+
+const enum ec_led_id supported_led_ids[] = {EC_LED_ID_BATTERY_LED};
 
-const enum ec_led_id supported_led_ids[] = {
-	EC_LED_ID_POWER_LED,
-};
 const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
 
-/*
- * We only have a blue and an amber LED, so setting any other colour results in
- * both LEDs being off.
- */
-struct pwm_led led_color_map[EC_LED_COLOR_COUNT] = {
-				/* Amber, Blue */
-	[EC_LED_COLOR_RED]    = {   0,   0 },
-	[EC_LED_COLOR_GREEN]  = {   0,   0 },
-	[EC_LED_COLOR_BLUE]   = {   0, 100 },
-	[EC_LED_COLOR_YELLOW] = {   0,   0 },
-	[EC_LED_COLOR_WHITE]  = {   0,   0 },
-	[EC_LED_COLOR_AMBER]  = {  100,  0 },
+enum led_color {
+	LED_OFF = 0,
+	LED_AMBER,
+	LED_WHITE,
+	LED_COLOR_COUNT  /* Number of colors, not a color itself */
 };
 
-/* One logical LED with amber and blue channels. */
-struct pwm_led pwm_leds[CONFIG_LED_PWM_COUNT] = {
-	{
-		PWM_CH_LED1_AMBER,
-		PWM_CH_LED2_BLUE,
-		PWM_LED_NO_CHANNEL,
-	},
-};
+static int led_set_color_battery(enum led_color color)
+{
+	switch (color) {
+	case LED_OFF:
+		gpio_set_level(GPIO_BAT_LED_WHITE_L, BAT_LED_OFF);
+		gpio_set_level(GPIO_BAT_LED_AMBER_L, BAT_LED_OFF);
+		break;
+	case LED_WHITE:
+		gpio_set_level(GPIO_BAT_LED_WHITE_L, BAT_LED_ON);
+		gpio_set_level(GPIO_BAT_LED_AMBER_L, BAT_LED_OFF);
+		break;
+	case LED_AMBER:
+		gpio_set_level(GPIO_BAT_LED_WHITE_L, BAT_LED_OFF);
+		gpio_set_level(GPIO_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)
 {
-	memset(brightness_range, '\0',
-	       sizeof(*brightness_range) * EC_LED_COLOR_COUNT);
-	brightness_range[EC_LED_COLOR_AMBER] = 100;
-	brightness_range[EC_LED_COLOR_BLUE] = 100;
+	brightness_range[EC_LED_COLOR_WHITE] = 1;
+	brightness_range[EC_LED_COLOR_AMBER] = 1;
 }
 
-int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
+static int led_set_color(enum ec_led_id led_id, enum led_color color)
 {
-	enum pwm_led_id pwm_id;
+	int rv;
 
-	/* Convert ec_led_id to pwm_led_id. */
-	if (led_id == EC_LED_ID_POWER_LED)
-		pwm_id = PWM_LED0;
-	else
+	switch (led_id) {
+	case EC_LED_ID_BATTERY_LED:
+		rv = led_set_color_battery(color);
+		break;
+	default:
 		return EC_ERROR_UNKNOWN;
+	}
+	return rv;
+}
 
-	if (brightness[EC_LED_COLOR_BLUE])
-		set_pwm_led_color(pwm_id, EC_LED_COLOR_BLUE);
-	else if (brightness[EC_LED_COLOR_AMBER])
-		set_pwm_led_color(pwm_id, EC_LED_COLOR_AMBER);
+int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
+{
+	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_id, -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++ & 0x4 ?
+				      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 & 0x4) ? 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 & 0x4) ? 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);