madoo: add Power LED behavior

On madoo, we have a LED indicator with following:
Power LED:
 System S0: White.
 System S0ix: 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 white (1 sec on, 1 sec off)
 AC mode:
  Charging: Amber.
  Full charged: White.

  only AC without battery: Blinking Amber (0.5 sec on, 0.5 sec off).

BUG=b:163935841
BRANCH=none
TEST=test on waddledoo reference board ，battery 、 Power LEDs are work.

Signed-off-by: Leo-Tsai <leocx_tsai@compal.corp-partner.google.com>
Change-Id: I633582dfbcf2a0050d3c30f9a70ff838f2cfcdc7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2352958
Reviewed-by: Diana Z <dzigterman@chromium.org>

4 files changed, 98 insertions, 77 deletions

diff --git a/board/madoo/board.c b/board/madoo/board.c
index 8a798788ad..43fbb9335d 100644
--- a/board/madoo/board.c
+++ b/board/madoo/board.c
@@ -519,18 +519,6 @@ const struct pwm_t pwm_channels[] = {
 		.flags = PWM_CONFIG_DSLEEP,
 		.freq = 10000,
 	},
-
-	[PWM_CH_LED1_AMBER] = {
-		.channel = 2,
-		.flags = PWM_CONFIG_DSLEEP | PWM_CONFIG_ACTIVE_LOW,
-		.freq = 2400,
-	},
-
-	[PWM_CH_LED2_WHITE] = {
-		.channel = 0,
-		.flags = PWM_CONFIG_DSLEEP | PWM_CONFIG_ACTIVE_LOW,
-		.freq = 2400,
-	}
 };
 BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT);
 
diff --git a/board/madoo/board.h b/board/madoo/board.h
index f9185e3825..ed51e49a2d 100644
--- a/board/madoo/board.h
+++ b/board/madoo/board.h
@@ -33,26 +33,19 @@
 /* Keyboard */
 #define CONFIG_PWM_KBLIGHT
 
-/* LED */
-#define CONFIG_LED_PWM
-#define CONFIG_LED_PWM_COUNT 1
-#undef CONFIG_LED_PWM_NEAR_FULL_COLOR
-#undef CONFIG_LED_PWM_SOC_ON_COLOR
-#undef CONFIG_LED_PWM_SOC_SUSPEND_COLOR
-#undef CONFIG_LED_PWM_LOW_BATT_COLOR
-#define CONFIG_LED_PWM_NEAR_FULL_COLOR EC_LED_COLOR_WHITE
-#define CONFIG_LED_PWM_SOC_ON_COLOR EC_LED_COLOR_WHITE
-#define CONFIG_LED_PWM_SOC_SUSPEND_COLOR EC_LED_COLOR_WHITE
-#define CONFIG_LED_PWM_LOW_BATT_COLOR EC_LED_COLOR_AMBER
-
 /* PWM */
 #define CONFIG_PWM
-#define NPCX7_PWM1_SEL    1  /* GPIO C2 is used as PWM1. */
+#define NPCX7_PWM1_SEL    0  /* GPIO C2 is not used as PWM1. */
 
 /* USB */
 #define CONFIG_BC12_DETECT_PI3USB9201
 #define CONFIG_USBC_RETIMER_NB7V904M
 
+/* LED */
+#define CONFIG_LED_COMMON
+#define CONFIG_LED_POWER_LED
+#define CONFIG_LED_ONOFF_STATES
+
 /* USB PD */
 #define CONFIG_USB_PD_PORT_MAX_COUNT 2
 #define CONFIG_USB_PD_TCPM_RAA489000
@@ -150,8 +143,6 @@ enum sensor_id {
 
 enum pwm_channel {
 	PWM_CH_KBLIGHT,
-	PWM_CH_LED1_AMBER,
-	PWM_CH_LED2_WHITE,
 	PWM_CH_COUNT,
 };
 
diff --git a/board/madoo/gpio.inc b/board/madoo/gpio.inc
index 14f4342c5e..6bdb111ebf 100644
--- a/board/madoo/gpio.inc
+++ b/board/madoo/gpio.inc
@@ -93,6 +93,11 @@ GPIO(EC_AP_USB_C0_HPD,	     PIN(9, 3), GPIO_OUT_LOW)
 GPIO(HDMI_SEL_L,	     PIN(7, 2), GPIO_OUT_HIGH)
 GPIO(EC_BATTERY_PRES_ODL,    PIN(E, 1), GPIO_INPUT)
 
+/*LEDs*/
+GPIO(BAT_LED_AMBER_L,  PIN(C, 4), GPIO_OUT_HIGH)
+GPIO(BAT_LED_WHITE_L,  PIN(C, 3), GPIO_OUT_HIGH)
+GPIO(PWR_LED_WHITE_L,  PIN(C, 2), GPIO_OUT_HIGH)
+
 /*
  * Waddledoo doesn't have these physical pins coming to the EC but uses other
  * logic.
@@ -116,7 +121,6 @@ ALTERNATE(PIN_MASK(8, 0x04), 0, MODULE_KEYBOARD_SCAN, GPIO_ODR_HIGH)		 /* KSO14
 GPIO(EC_KSO_02_INV, PIN(1, 7), GPIO_OUT_LOW)	/* KSO2 inverted */
 
 /* PWM */
-ALTERNATE(PIN_MASK(C, 0x1C), 0, MODULE_PWM, 0)   /* PWM0-2 */
 ALTERNATE(PIN_MASK(8, BIT(0)), 0, MODULE_PWM, 0) /* PWM3 */
 
 /* UART */
diff --git a/board/madoo/led.c b/board/madoo/led.c
index ca9a05bd84..e22f9cff42 100644
--- a/board/madoo/led.c
+++ b/board/madoo/led.c
@@ -1,70 +1,108 @@
 /* Copyright 2020 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 madoo
  */
 
-/* Waddledoo specific PWM LED settings. */
-
-#include "common.h"
 #include "ec_commands.h"
-#include "led_pwm.h"
-#include "pwm.h"
-#include "util.h"
+#include "gpio.h"
+#include "led_common.h"
+#include "led_onoff_states.h"
+#include "hooks.h"
 
-const enum ec_led_id supported_led_ids[] = {
-	EC_LED_ID_POWER_LED,
+#define LED_OFF_LVL	1
+#define LED_ON_LVL	0
+
+const int led_charge_lvl_1;
+
+const int led_charge_lvl_2 = 100;
+
+/* madoo: Note there is only LED for charge / power */
+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] = {{EC_LED_COLOR_WHITE, LED_INDEFINITE} },
+	[STATE_DISCHARGE_S0]	     = {{LED_OFF, LED_INDEFINITE} },
+	[STATE_DISCHARGE_S0_BAT_LOW] = {{EC_LED_COLOR_WHITE, 1 * LED_ONE_SEC},
+					{LED_OFF, 1 * LED_ONE_SEC} },
+	/* STATE_DISCHARGE_S3 will changed if sku is clamshells */
+	[STATE_DISCHARGE_S3]	     = {{LED_OFF, LED_INDEFINITE} },
+	[STATE_DISCHARGE_S5]         = {{LED_OFF, LED_INDEFINITE} },
+	[STATE_BATTERY_ERROR]        = {{EC_LED_COLOR_AMBER, 0.5 * LED_ONE_SEC},
+					{LED_OFF, 0.5 * LED_ONE_SEC} },
 };
-const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
-/*
- * We only have a white 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, White */
-	[EC_LED_COLOR_RED]    = {   0,   0 },
-	[EC_LED_COLOR_GREEN]  = {   0,   0 },
-	[EC_LED_COLOR_BLUE]   = {   0,   0 },
-	[EC_LED_COLOR_YELLOW] = {   0,   0 },
-	[EC_LED_COLOR_WHITE]  = {   0, 100 },
-	[EC_LED_COLOR_AMBER]  = {  100,  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} },
 };
 
-/* One logical LED with amber and white channels. */
-struct pwm_led pwm_leds[CONFIG_LED_PWM_COUNT] = {
-	{
-		.ch0 = PWM_CH_LED1_AMBER,
-		.ch1 = PWM_CH_LED2_WHITE,
-		.ch2 = PWM_LED_NO_CHANNEL,
-		.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
 };
 
-void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range)
+const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
+
+void led_set_color_power(enum ec_led_colors color)
 {
-	memset(brightness_range, '\0',
-	       sizeof(*brightness_range) * EC_LED_COLOR_COUNT);
-	brightness_range[EC_LED_COLOR_AMBER] = 100;
-	brightness_range[EC_LED_COLOR_WHITE] = 100;
+	if (color == EC_LED_COLOR_WHITE)
+		gpio_set_level(GPIO_PWR_LED_WHITE_L, LED_ON_LVL);
+	else
+		/* LED_OFF and unsupported colors */
+		gpio_set_level(GPIO_PWR_LED_WHITE_L, LED_OFF_LVL);
 }
 
-int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
+void led_set_color_battery(enum ec_led_colors color)
 {
-	enum pwm_led_id pwm_id;
+	switch (color) {
+	case EC_LED_COLOR_WHITE:
+		gpio_set_level(GPIO_BAT_LED_WHITE_L, LED_ON_LVL);
+		gpio_set_level(GPIO_BAT_LED_AMBER_L, LED_OFF_LVL);
+		break;
+	case EC_LED_COLOR_AMBER:
+		gpio_set_level(GPIO_BAT_LED_WHITE_L, LED_OFF_LVL);
+		gpio_set_level(GPIO_BAT_LED_AMBER_L, LED_ON_LVL);
+		break;
+	default: /* LED_OFF and other unsupported colors */
+		gpio_set_level(GPIO_BAT_LED_WHITE_L, LED_OFF_LVL);
+		gpio_set_level(GPIO_BAT_LED_AMBER_L, LED_OFF_LVL);
+		break;
+	}
+}
 
-	/* 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;
+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_WHITE] = 1;
+		brightness_range[EC_LED_COLOR_AMBER] = 1;
+	} else if (led_id == EC_LED_ID_POWER_LED) {
+		brightness_range[EC_LED_COLOR_WHITE] = 1;
+	}
+}
 
-	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);
+int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
+{
+	if (led_id == EC_LED_ID_BATTERY_LED) {
+		if (brightness[EC_LED_COLOR_WHITE] != 0)
+			led_set_color_battery(EC_LED_COLOR_WHITE);
+		else 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);
+	}
 
 	return EC_SUCCESS;
 }
+