Mithrax: Configure LED behavior

Mithrax has a battery LED and no power LED.

Battery LED AC mode:

	Charging (0%-94%): Amber
	Full charged: White

Battery LED DC mode:

	S0: Solid White
	S3/S0ix: Blinking White, 1 sec on/3 sec off
	S5: Led off

	Battery Low(S0): Blinking Amber, 1 sec on/3 sec off
	Battery Low(S3/S0ix): Blinking White, 1 sec on/3 sec off
	Battery Low(S5): Led off

	Battery Error(S0): Blinking Amber, 1 sec on/1 sec off
	Battery Error(S3/S0ix): Blinking White, 1 sec on/3 sec off
	Battery Error(S5): Led off

BUG=b:232889856
BRANCH=none
TEST=make BOARD=mithrax, and verify the led behavior on mithrax

Signed-off-by: Leila Lin <leilacy_lin@compal.corp-partner.google.com>
Change-Id: Ice0c1ccf90c279ba7559adc4e8445c62b181fe4c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3658670
Reviewed-by: Ricky Chang <rickytlchang@chromium.org>
Commit-Queue: LeilaCY Lin <leilacy_lin@compal.corp-partner.google.com.test-google-a.com>
Reviewed-by: LeilaCY Lin <leilacy_lin@compal.corp-partner.google.com.test-google-a.com>
Tested-by: LeilaCY Lin <leilacy_lin@compal.corp-partner.google.com.test-google-a.com>
Reviewed-by: Elmo Lan <elmo_lan@compal.corp-partner.google.com>
Reviewed-by: Boris Mittelberg <bmbm@google.com>

3 files changed, 4 insertions, 31 deletions

diff --git a/board/mithrax/board.h b/board/mithrax/board.h
index eb9f8f969f..90716c9112 100644
--- a/board/mithrax/board.h
+++ b/board/mithrax/board.h
@@ -24,7 +24,6 @@
 /* LED */
 #define CONFIG_LED_ONOFF_STATES
 #define CONFIG_LED_ONOFF_STATES_BAT_LOW 10
-#define GPIO_PWR_LED_WHITE_L	GPIO_LED_1_L
 #define GPIO_BAT_LED_AMBER_L	GPIO_LED_3_L
 #define GPIO_BAT_LED_WHITE_L	GPIO_LED_4_L
 
diff --git a/board/mithrax/gpio.inc b/board/mithrax/gpio.inc
index 996b0fae3d..133efd0390 100644
--- a/board/mithrax/gpio.inc
+++ b/board/mithrax/gpio.inc
@@ -84,7 +84,6 @@ GPIO(VCCST_PWRGD_OD,                 PIN(A, 4), GPIO_ODR_LOW)
 /* LED */
 GPIO(LED_4_L,                        PIN(6, 0), GPIO_OUT_HIGH) /* battery led white */
 GPIO(LED_3_L,                        PIN(C, 2), GPIO_OUT_HIGH) /* battery led amber */
-GPIO(LED_1_L,                        PIN(C, 4), GPIO_OUT_HIGH) /* power led white */
 
 /* UART alternate functions */
 ALTERNATE(PIN_MASK(6, 0x30), 0, MODULE_UART, 0)              /* GPIO64/CR_SIN1, GPO65/CR_SOUT1/FLPRG1_L */
@@ -127,6 +126,7 @@ UNUSED(PIN(3, 2))       /* GPO32/TRIS_L */
 UNUSED(PIN(3, 5))       /* GPO35/CR_SOUT4/TEST_L */
 UNUSED(PIN(6, 6))       /* GPIO66 */
 UNUSED(PIN(C, 3))       /* GPIOC3 */
+UNUSED(PIN(C, 4))       /* GPIOC4 */
 UNUSED(PIN(6, 2))       /* GPIO62 */
 UNUSED(PIN(B, 1))       /* GPIOB1 */
 UNUSED(PIN(5, 7))       /* GPIO57/SER_IRQ/ESPI_ALERT_L */
diff --git a/board/mithrax/led.c b/board/mithrax/led.c
index 61fc766e57..5abaed2a25 100644
--- a/board/mithrax/led.c
+++ b/board/mithrax/led.c
@@ -22,41 +22,22 @@ __override struct led_descriptor
 	[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]	     = {{EC_LED_COLOR_WHITE, LED_INDEFINITE} },
 	[STATE_DISCHARGE_S0_BAT_LOW] = {{EC_LED_COLOR_AMBER, 1 * LED_ONE_SEC},
 					{LED_OFF, 3 * LED_ONE_SEC} },
-	[STATE_DISCHARGE_S3]	     = {{LED_OFF, LED_INDEFINITE} },
+	[STATE_DISCHARGE_S3]	     = {{EC_LED_COLOR_WHITE, 1 * LED_ONE_SEC},
+					{LED_OFF, 3 * LED_ONE_SEC} },
 	[STATE_DISCHARGE_S5]         = {{LED_OFF, LED_INDEFINITE} },
 	[STATE_BATTERY_ERROR]        = {{EC_LED_COLOR_AMBER, 1 * LED_ONE_SEC},
 					{LED_OFF, 1 * LED_ONE_SEC} },
 };
 
-__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,	   3 * LED_ONE_SEC} },
-	[PWR_LED_STATE_SUSPEND_NO_AC] = {{EC_LED_COLOR_WHITE, 1 * LED_ONE_SEC},
-					{LED_OFF,	   3 * LED_ONE_SEC} },
-	[PWR_LED_STATE_OFF]           = {{LED_OFF, LED_INDEFINITE} },
-};
-
 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_power(enum ec_led_colors color)
-{
-	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);
-}
-
 __override void led_set_color_battery(enum ec_led_colors color)
 {
 	switch (color) {
@@ -93,8 +74,6 @@ 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;
 	}
 }
 
@@ -107,11 +86,6 @@ int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
 			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;