summaryrefslogtreecommitdiff
path: root/board/scarlet
diff options
context:
space:
mode:
authorPhilip Chen <philipchen@google.com>2017-02-14 00:20:14 -0800
committerchrome-bot <chrome-bot@chromium.org>2017-06-07 23:45:28 -0700
commitcb317939245b146f8dbd841499963e00b85a58a1 (patch)
tree856844ff9cc3b196ed2ddaf5475b05a6cbce437e /board/scarlet
parent38288aee7391efaabea2fca5575494d5e26f0238 (diff)
downloadchrome-ec-cb317939245b146f8dbd841499963e00b85a58a1.tar.gz
scarlet: add LED behavior
Amber: charging Green: fully charged Red: battery error Off: no power adapter connected BUG=chrome-os-partner:62207, b:62307687 CQ-DEPEND=CL:524977 BRANCH=gru TEST=manually on rev0 board Change-Id: I4b1ee85ae65b221f7199bf6cc245668de23546a9 Reviewed-on: https://chromium-review.googlesource.com/442365 Reviewed-by: Shawn N <shawnn@chromium.org> Commit-Queue: Philip Chen <philipchen@chromium.org> Tested-by: Philip Chen <philipchen@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/524980 Commit-Ready: Philip Chen <philipchen@chromium.org> Reviewed-by: Philip Chen <philipchen@chromium.org>
Diffstat (limited to 'board/scarlet')
-rw-r--r--board/scarlet/board.h3
-rw-r--r--board/scarlet/build.mk2
-rw-r--r--board/scarlet/gpio.inc5
-rw-r--r--board/scarlet/led.c129
4 files changed, 131 insertions, 8 deletions
diff --git a/board/scarlet/board.h b/board/scarlet/board.h
index 6de2365ee2..714a79ecfc 100644
--- a/board/scarlet/board.h
+++ b/board/scarlet/board.h
@@ -20,9 +20,6 @@
#define CONFIG_I2C_VIRTUAL_BATTERY
#define CONFIG_I2C_PASSTHRU_RESTRICTED
#define CONFIG_LED_COMMON
-#define CONFIG_LED_POLICY_STD
-#define CONFIG_LED_BAT_ACTIVE_LOW
-#define CONFIG_LED_POWER_ACTIVE_LOW
#define CONFIG_LOW_POWER_IDLE
#define CONFIG_POWER_COMMON
#define CONFIG_PWM
diff --git a/board/scarlet/build.mk b/board/scarlet/build.mk
index 1d6e5cf98d..2991539c4d 100644
--- a/board/scarlet/build.mk
+++ b/board/scarlet/build.mk
@@ -10,4 +10,4 @@
CHIP:=npcx
CHIP_VARIANT:=npcx5m5g
-board-y=battery.o board.o usb_pd_policy.o
+board-y=battery.o board.o usb_pd_policy.o led.o
diff --git a/board/scarlet/gpio.inc b/board/scarlet/gpio.inc
index 13db2c6ca0..a91cdb3605 100644
--- a/board/scarlet/gpio.inc
+++ b/board/scarlet/gpio.inc
@@ -110,7 +110,7 @@ GPIO(USB_C1_DISCHARGE, PIN(B, 1), GPIO_OUT_LOW)
GPIO(GPIOB6_NC, PIN(B, 6), GPIO_INPUT | GPIO_PULL_UP)
/* Scarlet LEDs */
-GPIO(BAT_LED_GREEN, PIN(4, 4), GPIO_OUT_HIGH | GPIO_OPEN_DRAIN)
+GPIO(BAT_LED_GREEN, PIN(C, 3), GPIO_OUT_HIGH | GPIO_OPEN_DRAIN)
GPIO(BAT_LED_RED, PIN(8, 0), GPIO_OUT_HIGH | GPIO_OPEN_DRAIN)
/*
@@ -138,9 +138,6 @@ ALTERNATE(PIN_MASK(9, 0x07), 1, MODULE_I2C, 0)
ALTERNATE(PIN_MASK(D, 0x03), 1, MODULE_I2C, 0)
/* PWM2 / BLPWM */
ALTERNATE(PIN_MASK(C, 0x10), 1, MODULE_PWM, 0)
-/* PWM3 / LED_RED(net LED_CHARGE) */
-ALTERNATE(PIN_MASK(8, 0x01), 1, MODULE_PWM, 0)
-
/* CR_SIN/SOUT GPIO64/65 */
ALTERNATE(PIN_MASK(6, 0x30), 1, MODULE_UART, GPIO_PULL_UP)
/* ADC0-4 */
diff --git a/board/scarlet/led.c b/board/scarlet/led.c
new file mode 100644
index 0000000000..0062b0bb41
--- /dev/null
+++ b/board/scarlet/led.c
@@ -0,0 +1,129 @@
+/* Copyright 2017 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.
+ *
+ * Battery LED control for Scarlet board.
+ */
+
+#include "battery.h"
+#include "charge_state.h"
+#include "chipset.h"
+#include "hooks.h"
+#include "led_common.h"
+#include "lid_switch.h"
+#include "pwm.h"
+#include "util.h"
+
+/* LEDs on Scarlet are active low. */
+#define BAT_LED_ON 0
+#define BAT_LED_OFF 1
+
+const enum ec_led_id supported_led_ids[] = { EC_LED_ID_BATTERY_LED };
+
+const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
+
+enum led_color {
+ LED_OFF = 0,
+ LED_RED,
+ LED_AMBER,
+ LED_GREEN,
+ LED_COLOR_COUNT /* Number of colors, not a color itself */
+};
+
+static int bat_led_set_color(enum led_color color)
+{
+ switch (color) {
+ case LED_OFF:
+ gpio_set_level(GPIO_BAT_LED_GREEN, BAT_LED_OFF);
+ gpio_set_level(GPIO_BAT_LED_RED, BAT_LED_OFF);
+ break;
+ case LED_RED:
+ gpio_set_level(GPIO_BAT_LED_GREEN, BAT_LED_OFF);
+ gpio_set_level(GPIO_BAT_LED_RED, BAT_LED_ON);
+ break;
+ case LED_AMBER:
+ gpio_set_level(GPIO_BAT_LED_GREEN, BAT_LED_ON);
+ gpio_set_level(GPIO_BAT_LED_RED, BAT_LED_ON);
+ break;
+ case LED_GREEN:
+ gpio_set_level(GPIO_BAT_LED_GREEN, BAT_LED_ON);
+ gpio_set_level(GPIO_BAT_LED_RED, BAT_LED_OFF);
+ break;
+ default:
+ return EC_ERROR_UNKNOWN;
+ }
+ return EC_SUCCESS;
+}
+
+static void scarlet_led_set_battery(void)
+{
+ static int battery_second;
+ uint32_t chflags = charge_get_flags();
+
+ battery_second++;
+
+ switch (charge_get_state()) {
+ case PWR_STATE_CHARGE:
+ bat_led_set_color(LED_AMBER);
+ break;
+ case PWR_STATE_DISCHARGE:
+ if (charge_get_percent() < 3)
+ bat_led_set_color((battery_second & 1)
+ ? LED_OFF : LED_AMBER);
+ else if (charge_get_percent() < 10)
+ bat_led_set_color((battery_second & 3)
+ ? LED_OFF : LED_AMBER);
+ else if (charge_get_percent() >= BATTERY_LEVEL_NEAR_FULL &&
+ (chflags & CHARGE_FLAG_EXTERNAL_POWER))
+ bat_led_set_color(LED_GREEN);
+ else
+ bat_led_set_color(LED_OFF);
+ break;
+ case PWR_STATE_ERROR:
+ bat_led_set_color(LED_RED);
+ break;
+ case PWR_STATE_CHARGE_NEAR_FULL:
+ bat_led_set_color(LED_GREEN);
+ break;
+ case PWR_STATE_IDLE: /* External power connected in IDLE. */
+ if (chflags & CHARGE_FLAG_FORCE_IDLE)
+ bat_led_set_color(
+ (battery_second & 0x2) ? LED_GREEN : LED_AMBER);
+ else
+ bat_led_set_color(LED_GREEN);
+ break;
+ default:
+ /* Other states don't alter LED behavior */
+ 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_RED] = 1;
+ brightness_range[EC_LED_COLOR_GREEN] = 1;
+ }
+}
+
+int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
+{
+ if (led_id == EC_LED_ID_BATTERY_LED) {
+ gpio_set_level(GPIO_BAT_LED_RED,
+ (brightness[EC_LED_COLOR_RED] != 0) ?
+ BAT_LED_ON : BAT_LED_OFF);
+ gpio_set_level(GPIO_BAT_LED_GREEN,
+ (brightness[EC_LED_COLOR_GREEN] != 0) ?
+ BAT_LED_ON : BAT_LED_OFF);
+ return EC_SUCCESS;
+ }
+ return EC_ERROR_UNKNOWN;
+}
+
+/* Called by hook task every 1 sec */
+static void led_second(void)
+{
+ if (led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED))
+ scarlet_led_set_battery();
+}
+DECLARE_HOOK(HOOK_SECOND, led_second, HOOK_PRIO_DEFAULT);