Lazor: Modify LED behavior.

LED behavior:
Charging	| Amber on (S0/S3/S5)
Full Charged	| Blue on (S0/S3/S5)
Discharging S3	| Amber on 1 sec, off 3 sec
Discharging S5	| off
Error		| Amber on 1 sec, off 1 sec
Discharging S0	| Blue on
Factory mode	| Blue on 2 sec, Amber on 2 sec

BUG=b:158226994
BRANCH=none
TEST=make buildall -j; check led behavior in every state on Lazor

Change-Id: Ie654c64f8bb6bb6e364edc1b61009f97638e8f1a
Signed-off-by: Sue Chen <sue.chen@quanta.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2235233
Reviewed-by: Alexandru M Stan <amstan@chromium.org>
Tested-by: Alexandru M Stan <amstan@chromium.org>
Commit-Queue: Alexandru M Stan <amstan@chromium.org>

2 files changed, 53 insertions, 64 deletions

diff --git a/board/lazor/gpio.inc b/board/lazor/gpio.inc
index dc08c9d17f..932423f72a 100644
--- a/board/lazor/gpio.inc
+++ b/board/lazor/gpio.inc
@@ -94,10 +94,8 @@ GPIO(USB_A_CDP_ILIM_EN,     PIN(7, 5), GPIO_OUT_HIGH)  /* H: CDP, L:SDP. Only on
 GPIO(USB_A0_OC_ODL,         PIN(D, 1), GPIO_ODR_HIGH)
 
 /* LEDs */
-GPIO(EC_CHG_LED_Y_C0,       PIN(6, 0), GPIO_OUT_LOW)   /* NC in the schematic */
-GPIO(EC_CHG_LED_W_C0,       PIN(C, 0), GPIO_OUT_LOW)   /* NC in the schematic */
 GPIO(EC_CHG_LED_Y_C1,       PIN(C, 3), GPIO_OUT_LOW)
-GPIO(EC_CHG_LED_W_C1,       PIN(C, 4), GPIO_OUT_LOW)
+GPIO(EC_CHG_LED_B_C1,       PIN(C, 4), GPIO_OUT_LOW)
 
 /* PWM */
 GPIO(KB_BL_PWM,             PIN(8, 0), GPIO_INPUT)     /* PWM3 */
diff --git a/board/lazor/led.c b/board/lazor/led.c
index 757348f07e..5daf69e3b8 100644
--- a/board/lazor/led.c
+++ b/board/lazor/led.c
@@ -17,11 +17,12 @@
 #include "system.h"
 #include "util.h"
 
+#define LED_ONE_SEC (1000 / HOOK_TICK_INTERVAL_MS)
+
 #define BAT_LED_ON 1
 #define BAT_LED_OFF 0
 
 const enum ec_led_id supported_led_ids[] = {
-	EC_LED_ID_RIGHT_LED,
 	EC_LED_ID_LEFT_LED,
 };
 
@@ -30,105 +31,98 @@ const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
 enum led_color {
 	LED_OFF = 0,
 	LED_AMBER,
-	LED_WHITE,
+	LED_BLUE,
 	LED_COLOR_COUNT  /* Number of colors, not a color itself */
 };
 
-static void side_led_set_color(int port, enum led_color color)
+static void led_set_color(enum led_color color)
 {
-	gpio_set_level(port ? GPIO_EC_CHG_LED_Y_C1 : GPIO_EC_CHG_LED_Y_C0,
+	gpio_set_level(GPIO_EC_CHG_LED_Y_C1,
 		(color == LED_AMBER) ? BAT_LED_ON : BAT_LED_OFF);
-	gpio_set_level(port ? GPIO_EC_CHG_LED_W_C1 : GPIO_EC_CHG_LED_W_C0,
-		(color == LED_WHITE) ? BAT_LED_ON : BAT_LED_OFF);
+	gpio_set_level(GPIO_EC_CHG_LED_B_C1,
+		(color == LED_BLUE) ? BAT_LED_ON : BAT_LED_OFF);
 }
 
 void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range)
 {
 	brightness_range[EC_LED_COLOR_AMBER] = 1;
-	brightness_range[EC_LED_COLOR_WHITE] = 1;
+	brightness_range[EC_LED_COLOR_BLUE] = 1;
 }
 
 int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
 {
-	int port;
-
-	switch (led_id) {
-	case EC_LED_ID_RIGHT_LED:
-		port = 0;
-		break;
-	case EC_LED_ID_LEFT_LED:
-		port = 1;
-		break;
-	default:
-		return EC_ERROR_PARAM1;
-	}
-
-	if (brightness[EC_LED_COLOR_WHITE] != 0)
-		side_led_set_color(port, LED_WHITE);
+	if (brightness[EC_LED_COLOR_BLUE] != 0)
+		led_set_color(LED_BLUE);
 	else if (brightness[EC_LED_COLOR_AMBER] != 0)
-		side_led_set_color(port, LED_AMBER);
+		led_set_color(LED_AMBER);
 	else
-		side_led_set_color(port, LED_OFF);
+		led_set_color(LED_OFF);
 
 	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))
-		side_led_set_color(0, (port == 0) ? color : LED_OFF);
-	if (led_auto_control_is_enabled(EC_LED_ID_LEFT_LED))
-		side_led_set_color(1, (port == 1) ? color : LED_OFF);
-}
-
 static void board_led_set_battery(void)
 {
 	static int battery_ticks;
+	int color = LED_OFF;
+	int period = 0;
 	uint32_t chflags = charge_get_flags();
 
 	battery_ticks++;
 
 	switch (charge_get_state()) {
 	case PWR_STATE_CHARGE:
-		/* Always indicate when charging, even in suspend. */
-		set_active_port_color(LED_AMBER);
+		/* Always indicate amber on when charging. */
+		color = LED_AMBER;
 		break;
 	case PWR_STATE_DISCHARGE:
-		if (led_auto_control_is_enabled(EC_LED_ID_RIGHT_LED)) {
-			if (charge_get_percent() <= 10)
-				side_led_set_color(0,
-				   (battery_ticks & 0x4) ? LED_WHITE : LED_OFF);
+		if (chipset_in_state(CHIPSET_STATE_ANY_SUSPEND)) {
+			/* Discharging in S3: Amber 1 sec, off 3 sec */
+			period = (1 + 3) * LED_ONE_SEC;
+			battery_ticks = battery_ticks % period;
+			if (battery_ticks < 1 * LED_ONE_SEC)
+				color = LED_AMBER;
 			else
-				side_led_set_color(0, LED_OFF);
+				color = LED_OFF;
+		} else if (chipset_in_state(CHIPSET_STATE_ANY_OFF)) {
+			/* Discharging in S5: off */
+			color = LED_OFF;
+		} else if (chipset_in_state(CHIPSET_STATE_ON)) {
+			/* Discharging in S0: Blue on */
+			color = LED_BLUE;
 		}
-
-		if (led_auto_control_is_enabled(EC_LED_ID_LEFT_LED))
-			side_led_set_color(1, LED_OFF);
 		break;
 	case PWR_STATE_ERROR:
-		set_active_port_color((battery_ticks & 0x2) ?
-				LED_WHITE : LED_OFF);
+		/* Battery error: Amber 1 sec, off 1 sec */
+		period = (1 + 1) * LED_ONE_SEC;
+		battery_ticks = battery_ticks % period;
+		if (battery_ticks < 1 * LED_ONE_SEC)
+			color = LED_AMBER;
+		else
+			color = LED_OFF;
 		break;
 	case PWR_STATE_CHARGE_NEAR_FULL:
-		set_active_port_color(LED_WHITE);
+		/* Full Charged: Blue on */
+		color = LED_BLUE;
 		break;
 	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			set_active_port_color((battery_ticks & 0x4) ?
-					LED_AMBER : LED_OFF);
-		else
-			set_active_port_color(LED_WHITE);
+		if (chflags & CHARGE_FLAG_FORCE_IDLE) {
+			/* Factory mode: Blue 2 sec, Amber 2 sec */
+			period = (2 + 2) * LED_ONE_SEC;
+			battery_ticks = battery_ticks % period;
+			if (battery_ticks < 2 * LED_ONE_SEC)
+				color = LED_BLUE;
+			else
+				color = LED_AMBER;
+		} else
+			color = LED_BLUE;
 		break;
 	default:
 		/* Other states don't alter LED behavior */
 		break;
 	}
+
+	led_set_color(color);
 }
 
 /* Called by hook task every TICK */
@@ -148,16 +142,13 @@ void led_control(enum ec_led_id led_id, enum ec_led_state state)
 
 	if (state == LED_STATE_RESET) {
 		led_auto_control(EC_LED_ID_LEFT_LED, 1);
-		led_auto_control(EC_LED_ID_RIGHT_LED, 1);
 		board_led_set_battery();
 		return;
 	}
 
-	color = state ? LED_WHITE : LED_OFF;
+	color = state ? LED_BLUE : LED_OFF;
 
 	led_auto_control(EC_LED_ID_LEFT_LED, 0);
-	led_auto_control(EC_LED_ID_RIGHT_LED, 0);
 
-	side_led_set_color(0, color);
-	side_led_set_color(1, color);
+	led_set_color(color);
 }