Wolf: add LED control by ectool support for wolf

BUG=None
BRANCH=wolf
TEST=emerge-wolf chromeos-ec

Change-Id: Ic944fe20cbbf553160af6c080ad3c89b67aa0a99
Signed-off-by: Crag.Wang <crag.wang@quantatw.com>
Reviewed-on: https://chromium-review.googlesource.com/183914
Reviewed-by: Dave Parker <dparker@chromium.org>
Commit-Queue: Dave Parker <dparker@chromium.org>
Tested-by: Dave Parker <dparker@chromium.org>

2 files changed, 82 insertions, 24 deletions

diff --git a/common/build.mk b/common/build.mk
index d2d72185aa..6b35f899e7 100644
--- a/common/build.mk
+++ b/common/build.mk
@@ -18,7 +18,7 @@ common-$(BOARD_peppy)+=battery_peppy.o led_common.o led_peppy.o
 common-$(BOARD_slippy)+=battery_slippy.o led_slippy.o
 common-$(BOARD_snow)+=extpower_snow.o
 common-$(BOARD_spring)+=battery_spring.o
-common-$(BOARD_wolf)+=battery_wolf.o led_wolf.o
+common-$(BOARD_wolf)+=battery_wolf.o led_common.o led_wolf.o
 
 common-$(CONFIG_BACKLIGHT_X86)+=backlight_x86.o
 common-$(CONFIG_BATTERY_BQ20Z453)+=battery_bq20z453.o
diff --git a/common/led_wolf.c b/common/led_wolf.c
index 3223bfb74c..982d815606 100644
--- a/common/led_wolf.c
+++ b/common/led_wolf.c
@@ -8,8 +8,12 @@
 #include "battery.h"
 #include "charge_state.h"
 #include "chipset.h"
+#include "ec_commands.h"
 #include "gpio.h"
 #include "hooks.h"
+#include "host_command.h"
+#include "led_common.h"
+#include "util.h"
 
 enum led_color {
 	LED_OFF = 0,
@@ -18,20 +22,27 @@ enum led_color {
 	LED_COLOR_COUNT  /* Number of colors, not a color itself */
 };
 
-static int bat_led_set_color(enum led_color color)
+const enum ec_led_id supported_led_ids[] = {
+	EC_LED_ID_BATTERY_LED};
+
+const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
+
+static int wolf_led_set_gpio(enum led_color color,
+			     enum gpio_signal gpio_led_white_l,
+			     enum gpio_signal gpio_led_amber_l)
 {
 	switch (color) {
 	case LED_OFF:
-		gpio_set_level(GPIO_BAT_LED0_L, 1);
-		gpio_set_level(GPIO_BAT_LED1_L, 1);
+		gpio_set_level(gpio_led_white_l, 1);
+		gpio_set_level(gpio_led_amber_l, 1);
 		break;
 	case LED_WHITE:
-		gpio_set_level(GPIO_BAT_LED0_L, 0);
-		gpio_set_level(GPIO_BAT_LED1_L, 1);
+		gpio_set_level(gpio_led_white_l, 0);
+		gpio_set_level(gpio_led_amber_l, 1);
 		break;
 	case LED_AMBER:
-		gpio_set_level(GPIO_BAT_LED0_L, 1);
-		gpio_set_level(GPIO_BAT_LED1_L, 0);
+		gpio_set_level(gpio_led_white_l, 1);
+		gpio_set_level(gpio_led_amber_l, 0);
 		break;
 	default:
 		return EC_ERROR_UNKNOWN;
@@ -39,43 +50,90 @@ static int bat_led_set_color(enum led_color color)
 	return EC_SUCCESS;
 }
 
-/* Called by hook task every 250mSec */
-static void led_tick(void)
+static int wolf_led_set_color_battery(enum led_color color)
 {
-	static int ticks;
-	uint32_t chflags = charge_get_flags();
+	return wolf_led_set_gpio(color, GPIO_BAT_LED0_L, GPIO_BAT_LED1_L);
+}
 
-	ticks++;
+static int wolf_led_set_color(enum ec_led_id led_id, enum led_color color)
+{
+	int rv;
+
+	led_auto_control(led_id, 0);
+	switch (led_id) {
+	case EC_LED_ID_BATTERY_LED:
+		rv = wolf_led_set_color_battery(color);
+		break;
+	default:
+		return EC_ERROR_UNKNOWN;
+	}
+	return rv;
+}
+
+int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
+{
+	if (brightness[EC_LED_COLOR_WHITE] != 0)
+		wolf_led_set_color(led_id, LED_WHITE);
+	else if (brightness[EC_LED_COLOR_YELLOW] != 0)
+		wolf_led_set_color(led_id, LED_AMBER);
+	else
+		wolf_led_set_color(led_id, LED_OFF);
+
+	return EC_SUCCESS;
+}
+
+void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range)
+{
+	/* Ignoring led_id as both leds support the same colors */
+	brightness_range[EC_LED_COLOR_WHITE] = 1;
+	brightness_range[EC_LED_COLOR_YELLOW] = 1;
+}
+
+static void wolf_led_set_battery(int ticks)
+{
+	uint32_t chflags = charge_get_flags();
 
 	switch (charge_get_state()) {
 	case PWR_STATE_CHARGE:
-		bat_led_set_color(LED_WHITE);
+		wolf_led_set_color_battery(LED_WHITE);
 		break;
 	case PWR_STATE_CHARGE_NEAR_FULL:
-		bat_led_set_color(LED_OFF);
+		wolf_led_set_color_battery(LED_OFF);
 		break;
 	case PWR_STATE_DISCHARGE:
 		if (chipset_in_state(CHIPSET_STATE_ON) ||
 		    chipset_in_state(CHIPSET_STATE_SUSPEND))
-			bat_led_set_color(
-			 (charge_get_percent() < BATTERY_LEVEL_LOW) ?
-			  LED_AMBER : LED_OFF);
+			wolf_led_set_color_battery(
+			(charge_get_percent() < BATTERY_LEVEL_LOW) ?
+			LED_AMBER : LED_OFF);
 		else
-			bat_led_set_color(LED_OFF);
+			wolf_led_set_color_battery(LED_OFF);
 		break;
 	case PWR_STATE_ERROR:
-		bat_led_set_color((ticks & 0x2) ? LED_AMBER : LED_OFF);
+		wolf_led_set_color_battery(
+			(ticks & 0x2) ? LED_AMBER : LED_OFF);
 		break;
-	case PWR_STATE_IDLE:
+	case PWR_STATE_IDLE: /* External power connected in IDLE. */
 		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			bat_led_set_color((ticks & 0x4) ? LED_WHITE : LED_OFF);
+			wolf_led_set_color_battery(
+			(ticks & 0x4) ? LED_WHITE : LED_OFF);
 		else
-			bat_led_set_color(LED_OFF);
+			wolf_led_set_color_battery(LED_OFF);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
 		break;
 	}
 }
-DECLARE_HOOK(HOOK_TICK, led_tick, HOOK_PRIO_DEFAULT);
 
+/* Called by hook task every 250mSec */
+static void led_tick(void)
+{
+	static int ticks;
+
+	ticks++;
+
+	if (led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED))
+		wolf_led_set_battery(ticks);
+}
+DECLARE_HOOK(HOOK_TICK, led_tick, HOOK_PRIO_DEFAULT);