gimble: Configure LED behavior

BUG=b:193600290
BRANCH=None
TEST=make -j BOARD=gimble

Signed-off-by: Will Tsai <will_tsai@wistron.corp-partner.google.com>
Change-Id: Id27c6f0fb0bcf4ba58be2a253ea6b823f3aa1590
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3023565
Tested-by: Scott Chao <scott_chao@wistron.corp-partner.google.com>
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Reviewed-by: caveh jalali <caveh@chromium.org>
Commit-Queue: caveh jalali <caveh@chromium.org>
Commit-Queue: Scott Chao <scott_chao@wistron.corp-partner.google.com>

3 files changed, 131 insertions, 80 deletions

diff --git a/board/gimble/board.h b/board/gimble/board.h
index 1d658c4219..e2cb504429 100644
--- a/board/gimble/board.h
+++ b/board/gimble/board.h
@@ -26,18 +26,6 @@
 
 #define CONFIG_MP2964
 
-/* LED */
-#define CONFIG_LED_PWM
-#define CONFIG_LED_PWM_COUNT 2
-#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
-
 /* Sensors */
 /* BMA253 accelerometer in lid */
 #define CONFIG_ACCEL_BMA255
diff --git a/board/gimble/led.c b/board/gimble/led.c
index 38caa38d37..24c0c742b2 100644
--- a/board/gimble/led.c
+++ b/board/gimble/led.c
@@ -3,91 +3,154 @@
  * found in the LICENSE file.
  */
 
-/* Brya specific PWM LED settings: there are 2 LEDs on each side of the board,
- * each one can be controlled separately. The LED colors are white or amber,
- * and the default behavior is tied to the charging process: both sides are
- * amber while charging the battery and white when the battery is charged.
- */
-
 #include <stdint.h>
 
+#include "charge_manager.h"
 #include "common.h"
 #include "compile_time_macros.h"
 #include "ec_commands.h"
-#include "led_pwm.h"
+#include "gpio.h"
+#include "led_common.h"
+#include "led_onoff_states.h"
 #include "pwm.h"
 #include "util.h"
 
-const enum ec_led_id supported_led_ids[] = {
-	EC_LED_ID_LEFT_LED,
-	EC_LED_ID_RIGHT_LED,
-};
+#define BAT_LED_ON_LVL 100
+#define BAT_LED_OFF_LVL 0
 
-const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
+#define PWR_LED_ON_LVL 1
+#define PWR_LED_OFF_LVL 0
 
-/*
- * We only have a white and an amber LED, so setting any other color 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 },
-};
+#define LED_SIDESEL_MB_PORT 0
+#define LED_SIDESEL_DB_PORT 1
 
-/* Two logical LEDs with amber and white channels. */
-struct pwm_led pwm_leds[CONFIG_LED_PWM_COUNT] = {
-	{
-		.ch0 = PWM_CH_LED1,
-		.ch1 = PWM_CH_LED2,
-		.ch2 = PWM_LED_NO_CHANNEL,
-		.enable = &pwm_enable,
-		.set_duty = &pwm_set_duty,
+__override 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]	     = {{LED_OFF,  LED_INDEFINITE} },
+	[STATE_DISCHARGE_S5]         = {{LED_OFF,  LED_INDEFINITE} },
+	[STATE_BATTERY_ERROR]        = {
+					{EC_LED_COLOR_WHITE, 0.5 * LED_ONE_SEC},
+					{LED_OFF,            0.5 * LED_ONE_SEC}
 	},
-	{
-		.ch0 = PWM_CH_LED3,
-		.ch1 = PWM_CH_LED4,
-		.ch2 = PWM_LED_NO_CHANNEL,
-		.enable = &pwm_enable,
-		.set_duty = &pwm_set_duty,
+	[STATE_FACTORY_TEST]         = {
+					{EC_LED_COLOR_WHITE, 1 * LED_ONE_SEC},
+					{LED_OFF,            1 * LED_ONE_SEC}
 	},
 };
 
-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_WHITE] = 100;
-}
+__override 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} },
+};
 
-int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
+
+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);
+
+__override void led_set_color_battery(enum ec_led_colors color)
 {
-	enum pwm_led_id pwm_id;
+	int port;
 
-	/* Convert ec_led_id to pwm_led_id. */
-	switch (led_id) {
-	case EC_LED_ID_LEFT_LED:
-		pwm_id = PWM_LED0;
+	/* There are four battery leds, LED1/LED2 are on MB side and
+	 * LED3/LED4 are on DB side. All leds are OFF by default.
+	 */
+	int led1_duty, led2_duty, led3_duty, led4_duty;
+
+	led1_duty = led2_duty = led3_duty = led4_duty = BAT_LED_OFF_LVL;
+
+	if (!led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED))
+		return;
+
+	/* Check which port is the charging port,
+	 * and turn on the corresponding led.
+	 */
+	port = charge_manager_get_active_charge_port();
+	switch (port) {
+	case LED_SIDESEL_MB_PORT:
+		switch (color) {
+		case EC_LED_COLOR_AMBER:
+			led1_duty = BAT_LED_ON_LVL;
+			break;
+		case EC_LED_COLOR_WHITE:
+			led2_duty = BAT_LED_ON_LVL;
+			break;
+		default: /* LED_OFF and other unsupported colors */
+			break;
+		}
 		break;
-	case EC_LED_ID_RIGHT_LED:
-		pwm_id = PWM_LED1;
+	case LED_SIDESEL_DB_PORT:
+		switch (color) {
+		case EC_LED_COLOR_AMBER:
+			led3_duty = BAT_LED_ON_LVL;
+			break;
+		case EC_LED_COLOR_WHITE:
+			led4_duty = BAT_LED_ON_LVL;
+			break;
+		default: /* LED_OFF and other unsupported colors */
+			break;
+		}
+		break;
+	default: /* Unknown charging port */
 		break;
-	default:
-		return EC_ERROR_UNKNOWN;
 	}
 
-	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);
+	pwm_set_duty(PWM_CH_LED1, led1_duty);
+	pwm_set_duty(PWM_CH_LED2, led2_duty);
+	pwm_set_duty(PWM_CH_LED3, led3_duty);
+	pwm_set_duty(PWM_CH_LED4, led4_duty);
+}
+
+__override void led_set_color_power(enum ec_led_colors color)
+{
+	if (color == EC_LED_COLOR_WHITE)
+		gpio_set_level(GPIO_POWER_LED_GATE, PWR_LED_ON_LVL);
 	else
-		/* Otherwise, the "color" is "off". */
-		set_pwm_led_color(pwm_id, -1);
+		/* LED_OFF and unsupported colors */
+		gpio_set_level(GPIO_POWER_LED_GATE, PWR_LED_OFF_LVL);
+}
+
+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;
+		brightness_range[EC_LED_COLOR_WHITE] = 1;
+	} else if (led_id == EC_LED_ID_POWER_LED) {
+		brightness_range[EC_LED_COLOR_WHITE] = 1;
+	}
+}
+
+int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
+{
+	if (led_id == EC_LED_ID_BATTERY_LED) {
+		led_auto_control(led_id, 0);
+		if (brightness[EC_LED_COLOR_AMBER] != 0)
+			led_set_color_battery(EC_LED_COLOR_AMBER);
+		else if (brightness[EC_LED_COLOR_WHITE] != 0)
+			led_set_color_battery(EC_LED_COLOR_WHITE);
+		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;
 }
diff --git a/board/gimble/pwm.c b/board/gimble/pwm.c
index 75d028a02f..73f63821e0 100644
--- a/board/gimble/pwm.c
+++ b/board/gimble/pwm.c
@@ -52,17 +52,17 @@ BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT);
 static void board_pwm_init(void)
 {
 	/*
-	 * Turn on all the LED at 50%.
-	 * Turn on the fan at 100%.
+	 * Turn off LED1 to LED4.
+	 * Turn on KB LED at 50%.
 	 */
 	pwm_enable(PWM_CH_LED1, 1);
-	pwm_set_duty(PWM_CH_LED1, 50);
+	pwm_set_duty(PWM_CH_LED1, 0);
 	pwm_enable(PWM_CH_LED2, 1);
-	pwm_set_duty(PWM_CH_LED2, 50);
+	pwm_set_duty(PWM_CH_LED2, 0);
 	pwm_enable(PWM_CH_LED3, 1);
-	pwm_set_duty(PWM_CH_LED3, 50);
+	pwm_set_duty(PWM_CH_LED3, 0);
 	pwm_enable(PWM_CH_LED4, 1);
-	pwm_set_duty(PWM_CH_LED4, 50);
+	pwm_set_duty(PWM_CH_LED4, 0);
 
 	pwm_enable(PWM_CH_KBLIGHT, 1);
 	pwm_set_duty(PWM_CH_KBLIGHT, 50);