Stern: Remove power_led and EC_SKU_ID

Remove power_led and EC_SKU_ID,and use white battery_led to show power
state in DC state

BUG=b:174282565
BRANCH=firmware-kukui-12573.B
TEST=make build all pass
     test firmware branch ,battery led can work normal

Signed-off-by: Mike Lee <mike5@huaqin.corp-partner.google.com>
Change-Id: Ie046588ef608294836ce0bffccfd2d68e8c77e78
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2562629
Reviewed-by: Chen-Tsung Hsieh <chentsung@chromium.org>
Commit-Queue: Chen-Tsung Hsieh <chentsung@chromium.org>

3 files changed, 3 insertions, 93 deletions

diff --git a/board/cerise/board.c b/board/cerise/board.c
index 61b06b3b3a..2f9fa19eda 100644
--- a/board/cerise/board.c
+++ b/board/cerise/board.c
@@ -447,43 +447,3 @@ void lid_angle_peripheral_enable(int enable)
 	keyboard_scan_enable(enable, KB_SCAN_DISABLE_LID_ANGLE);
 }
 #endif
-
-/* map from sku id voltage in mv */
-const int16_t sku_id_map[] = {
-	109,   /* 51.1K , 2.2K ohm */
-	211,   /* 51.1k , 6.8K ohm */
-};
-BUILD_ASSERT(ARRAY_SIZE(sku_id_map) == BOARD_SKU_ID_COUNT);
-
-#define THRESHOLD_MV 56 /* Simply assume 1800/16/2 */
-
-int board_get_sku_id(void)
-{
-	static int version = BOARD_SKU_ID_UNKNOWN;
-	int mv;
-	int i;
-
-	if (version != BOARD_SKU_ID_UNKNOWN)
-		return version;
-
-	mv = adc_read_channel(ADC_EC_SKU_ID);
-
-	if (mv == ADC_READ_ERROR)
-		mv = adc_read_channel(ADC_EC_SKU_ID);
-
-	for (i = 0; i < BOARD_SKU_ID_COUNT; ++i) {
-		if (mv < sku_id_map[i] + THRESHOLD_MV) {
-			version = i;
-			break;
-		}
-	}
-	/*
-	 * For devices without pogo, Disable ADC module after we detect the
-	 * board version, since this is the only thing ADC module needs to do
-	 * for this board.
-	 */
-	if (version != BOARD_SKU_ID_UNKNOWN)
-		adc_disable();
-
-	return version;
-}
diff --git a/board/cerise/board.h b/board/cerise/board.h
index 0adcf6b958..990570bd5e 100644
--- a/board/cerise/board.h
+++ b/board/cerise/board.h
@@ -51,7 +51,6 @@
 
 #define CONFIG_LED_ONOFF_STATES
 #define CONFIG_LED_ONOFF_STATES_BAT_LOW 10
-#define CONFIG_LED_POWER_LED
 #define CONFIG_LED_COMMON
 
 /* Motion Sensors */
diff --git a/board/cerise/led.c b/board/cerise/led.c
index 536733e87c..29db404b6f 100644
--- a/board/cerise/led.c
+++ b/board/cerise/led.c
@@ -22,8 +22,9 @@ 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_S3]	     = {{LED_OFF,  LED_INDEFINITE} },
+	[STATE_DISCHARGE_S0]         = {{EC_LED_COLOR_WHITE, LED_INDEFINITE} },
+	[STATE_DISCHARGE_S3]         = {{EC_LED_COLOR_WHITE, 2 * LED_ONE_SEC},
+					{LED_OFF, 2 * LED_ONE_SEC} },
 	[STATE_DISCHARGE_S5]         = {{LED_OFF,  LED_INDEFINITE} },
 	[STATE_DISCHARGE_S0_BAT_LOW] = {{EC_LED_COLOR_AMBER, 1 * LED_ONE_SEC},
 					{LED_OFF, 3 * LED_ONE_SEC} },
@@ -33,23 +34,7 @@ struct led_descriptor led_bat_state_table[LED_NUM_STATES][LED_NUM_PHASES] = {
 					{EC_LED_COLOR_AMBER, 2 * LED_ONE_SEC} },
 };
 
-struct led_descriptor led_bat_clamshell[LED_NUM_STATES][LED_NUM_PHASES] = {
-	[STATE_DISCHARGE_S0]        = {{EC_LED_COLOR_WHITE, LED_INDEFINITE} },
-	[STATE_DISCHARGE_S3]        = {{EC_LED_COLOR_WHITE, 2 * LED_ONE_SEC},
-					{LED_OFF, 2 * LED_ONE_SEC} },
-};
-
-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, 2 * LED_ONE_SEC},
-					{LED_OFF, 2 * LED_ONE_SEC} },
-	[PWR_LED_STATE_SUSPEND_NO_AC] = {{EC_LED_COLOR_WHITE, 2 * LED_ONE_SEC},
-					{LED_OFF, 2 * LED_ONE_SEC} },
-	[PWR_LED_STATE_OFF]           = {{LED_OFF, LED_INDEFINITE} },
-};
-
 const enum ec_led_id supported_led_ids[] = {
-	EC_LED_ID_POWER_LED,
 	EC_LED_ID_BATTERY_LED
 };
 const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
@@ -72,25 +57,11 @@ void led_set_color_battery(enum ec_led_colors color)
 	}
 }
 
-void led_set_color_power(enum ec_led_colors color)
-{
-	switch (color) {
-	case EC_LED_COLOR_WHITE:
-		ioex_set_level(IOEX_PWR_LED_WHITE_L, LED_ON_LVL);
-		break;
-	default:
-		ioex_set_level(IOEX_PWR_LED_WHITE_L, LED_OFF_LVL);
-		break;
-	}
-}
-
 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;
 	}
 }
 
@@ -103,28 +74,8 @@ int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
 			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);
 	} else {
 		return EC_ERROR_INVAL;
 	}
 	return EC_SUCCESS;
 }
-
-static void cerise_led_init(void)
-{
-	int i;
-
-	if (board_get_sku_id() == BOARD_SKU_ID_REV0) {
-		for (i = 0; i < LED_NUM_PHASES; i++) {
-			led_bat_state_table[STATE_DISCHARGE_S0][i] =
-				led_bat_clamshell[STATE_DISCHARGE_S0][i];
-			led_bat_state_table[STATE_DISCHARGE_S3][i] =
-				led_bat_clamshell[STATE_DISCHARGE_S3][i];
-		}
-	}
-}
-DECLARE_HOOK(HOOK_INIT, cerise_led_init, HOOK_PRIO_DEFAULT);