halvor: implement LED behavior

On halvor, we have a LED indicator with following:
Power LED:
 System S0: White.
 System S3: Blinking white (1 sec on, 1 sec off)
 System S5/G3: Off.

Battery LED:
DC mode:
 System S0: off.
 System S5/G3: Off.
 System battery low: Blinking Amber (1 sec on, 1 sec off)
AC mode:
 Charging: Amber.
 Full charged: White.

BUG=b/166057836
BRANCH=none
TEST=halvor test
1. Check battery LED on full charging / charging / discharging.
2. Check power LED on s0 / suspend / s5.
3. Check "ectool led" command for battery and power LED control.
4. Check battery LED on low battery state.

Change-Id: Ie6d6661c2b249336798099679635682e43aff5f3
Signed-off-by: Samsp_Liu <Samsp_Liu@compal.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2366418
Tested-by: SamSP Liu <samsp_liu@compal.corp-partner.google.com>
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
Commit-Queue: SamSP Liu <samsp_liu@compal.corp-partner.google.com>

1 files changed, 61 insertions, 75 deletions

diff --git a/board/halvor/led.c b/board/halvor/led.c
index 4e99b66579..47753899bf 100644
--- a/board/halvor/led.c
+++ b/board/halvor/led.c
@@ -5,99 +5,85 @@
  * Power and battery LED control for Halvor
  */
 
-#include "charge_manager.h"
-#include "common.h"
 #include "ec_commands.h"
-#include "hooks.h"
+#include "gpio.h"
 #include "led_common.h"
-#include "led_pwm.h"
-#include "pwm.h"
+#include "led_onoff_states.h"
+#include "chipset.h"
 
-const enum ec_led_id supported_led_ids[] = {
-	EC_LED_ID_POWER_LED,
+#define LED_ON_LVL 1
+#define LED_OFF_LVL 0
+
+const int led_charge_lvl_1 = 10;
+
+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_AMBER, LED_INDEFINITE} },
+	[STATE_CHARGING_LVL_2]	     = {{EC_LED_COLOR_AMBER, LED_INDEFINITE} },
+	[STATE_CHARGING_FULL_CHARGE] = {{LED_OFF, LED_INDEFINITE} },
+	[STATE_CHARGING_FULL_S5]     = {{LED_OFF, LED_INDEFINITE} },
+	[STATE_DISCHARGE_S0]	     = {{LED_OFF, LED_INDEFINITE} },
+	[STATE_DISCHARGE_S0_BAT_LOW] = {{EC_LED_COLOR_AMBER, 1 * LED_ONE_SEC},
+					{LED_OFF,	     1 * LED_ONE_SEC} },
+	[STATE_DISCHARGE_S3]	     = {{LED_OFF, LED_INDEFINITE} },
+	[STATE_DISCHARGE_S5]         = {{LED_OFF, LED_INDEFINITE} },
+	[STATE_BATTERY_ERROR]        = {{EC_LED_COLOR_AMBER, 1 * LED_ONE_SEC},
+					{LED_OFF,	     1 * LED_ONE_SEC} },
+	[STATE_FACTORY_TEST]         = {{EC_LED_COLOR_AMBER, 2 * LED_ONE_SEC},
+					{LED_OFF,	     2 * LED_ONE_SEC} },
 };
-const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
 
-struct pwm_led led_color_map[] = {
-				/* Red, Green, Blue */
-	[EC_LED_COLOR_RED] =    {  100,   0,     0 },
-	[EC_LED_COLOR_GREEN] =  {    0, 100,     0 },
-	[EC_LED_COLOR_BLUE] =   {    0,   0,   100 },
-	/* The green LED seems to be brighter than the others, so turn down
-	 * green from its natural level for these secondary colors.
-	 */
-	[EC_LED_COLOR_YELLOW] = {  100,  70,     0 },
-	[EC_LED_COLOR_WHITE] =  {  100,  70,   100 },
-	[EC_LED_COLOR_AMBER] =  {  100,  20,     0 },
+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, 1 * LED_ONE_SEC},
+					{LED_OFF,	     1 * LED_ONE_SEC} },
+	[PWR_LED_STATE_SUSPEND_NO_AC] = {{EC_LED_COLOR_WHITE, 1 * LED_ONE_SEC},
+					{LED_OFF,	     1 * LED_ONE_SEC} },
+	[PWR_LED_STATE_OFF]           = {{LED_OFF, LED_INDEFINITE} },
 };
 
-struct pwm_led pwm_leds[] = {
-	/* 2 RGB diffusers controlled by 1 set of 3 channels. */
-	[PWM_LED0] = {
-		.ch0 = PWM_CH_LED3_RED,
-		.ch1 = PWM_CH_LED2_GREEN,
-		.ch2 = PWM_CH_LED1_BLUE,
-		.enable = &pwm_enable,
-		.set_duty = &pwm_set_duty,
-	},
+const enum ec_led_id supported_led_ids[] = {
+	EC_LED_ID_BATTERY_LED,
+	EC_LED_ID_POWER_LED,
 };
+const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
 
-void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range)
+void led_set_color_battery(enum ec_led_colors color)
 {
-	brightness_range[EC_LED_COLOR_RED] = 255;
-	brightness_range[EC_LED_COLOR_GREEN] = 255;
-	brightness_range[EC_LED_COLOR_BLUE] = 255;
+	gpio_set_level(GPIO_LED_2_L,
+		(color == EC_LED_COLOR_AMBER) ? LED_ON_LVL : LED_OFF_LVL);
 }
 
-int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
+void led_set_color_power(enum ec_led_colors color)
 {
-	enum pwm_led_id pwm_id;
-
-	/* Convert ec_led_id to pwm_led_id. */
-	if (led_id == EC_LED_ID_POWER_LED)
-		pwm_id = PWM_LED0;
-	else
-		return EC_ERROR_UNKNOWN;
+	gpio_set_level(GPIO_LED_1_L,
+		(color == EC_LED_COLOR_WHITE) ? LED_ON_LVL : LED_OFF_LVL);
+}
 
-	if (brightness[EC_LED_COLOR_RED])
-		set_pwm_led_color(pwm_id, EC_LED_COLOR_RED);
-	else if (brightness[EC_LED_COLOR_GREEN])
-		set_pwm_led_color(pwm_id, EC_LED_COLOR_GREEN);
-	else if (brightness[EC_LED_COLOR_BLUE])
-		set_pwm_led_color(pwm_id, EC_LED_COLOR_BLUE);
-	else if (brightness[EC_LED_COLOR_YELLOW])
-		set_pwm_led_color(pwm_id, EC_LED_COLOR_YELLOW);
-	else if (brightness[EC_LED_COLOR_WHITE])
-		set_pwm_led_color(pwm_id, EC_LED_COLOR_WHITE);
-	else if (brightness[EC_LED_COLOR_AMBER])
-		set_pwm_led_color(pwm_id, EC_LED_COLOR_AMBER);
-	else
-		/* Otherwise, the "color" is "off". */
-		set_pwm_led_color(pwm_id, -1);
+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_AMBER] = 1;
+	else if (led_id == EC_LED_ID_POWER_LED)
+		brightness_range[EC_LED_COLOR_WHITE] = 1;
 
-	return EC_SUCCESS;
 }
 
-/* Illuminates the LED on the side of the active charging port. If not charging,
- * illuminates both LEDs.
- */
-static void led_set_charge_port_tick(void)
+int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
 {
-	int port;
-	int side_select_duty;
-
-	port = charge_manager_get_active_charge_port();
-	switch (port) {
-	case 0:
-		side_select_duty = 100;
-		break;
-	case 1:
-		side_select_duty = 0;
-		break;
-	default:
-		side_select_duty = 50;
+	if (led_id == EC_LED_ID_BATTERY_LED) {
+		if (brightness[EC_LED_COLOR_AMBER] != 0)
+			led_set_color_battery(EC_LED_COLOR_AMBER);
+		else
+			led_set_color_battery(LED_OFF);
+	} else if (led_id == EC_LED_ID_POWER_LED) {
+		if (brightness[EC_LED_COLOR_WHITE] != 0)
+			led_set_color_power(EC_LED_COLOR_WHITE);
+		else
+			led_set_color_power(LED_OFF);
 	}
 
-	pwm_set_duty(PWM_CH_LED4_SIDESEL, side_select_duty);
+	return EC_SUCCESS;
 }
-DECLARE_HOOK(HOOK_TICK, led_set_charge_port_tick, HOOK_PRIO_DEFAULT);