summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorPhilip Chen <philipchen@google.com>2017-07-25 14:11:53 -0700
committerchrome-bot <chrome-bot@chromium.org>2017-07-29 20:58:26 -0700
commit90a2060904f4b55f64c341ff985a6a5ee7c5210a (patch)
treefc6eeab99919c1cec43c438a80cb7f86636f3e9c /board
parent36607e45bf7b102f37335256281ff0c9094cd9a3 (diff)
downloadchrome-ec-90a2060904f4b55f64c341ff985a6a5ee7c5210a.tar.gz
nefario: Enable battery LED control
BUG=b:63408169 BRANCH=none TEST=build nefario (no boards to test yet) Change-Id: I1c170803b9e174dd969259aa6a3d3e910e872ba5 Signed-off-by: Philip Chen <philipchen@google.com> Reviewed-on: https://chromium-review.googlesource.com/584858 Commit-Ready: Philip Chen <philipchen@chromium.org> Tested-by: Philip Chen <philipchen@chromium.org> Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'board')
-rw-r--r--board/nefario/board.c5
-rw-r--r--board/nefario/board.h5
-rw-r--r--board/nefario/build.mk2
-rw-r--r--board/nefario/gpio.inc6
-rw-r--r--board/nefario/led.c118
5 files changed, 126 insertions, 10 deletions
diff --git a/board/nefario/board.c b/board/nefario/board.c
index 1bb04c5e0a..e766c64913 100644
--- a/board/nefario/board.c
+++ b/board/nefario/board.c
@@ -90,8 +90,9 @@ BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);
/******************************************************************************/
/* PWM channels. Must be in the exactly same order as in enum pwm_channel. */
const struct pwm_t pwm_channels[] = {
- /* ArcticSand part on Gru requires >= 2.6KHz */
- [PWM_CH_DISPLIGHT] = { 2, 0, 2600 },
+ [PWM_CH_LED_RED] = { 0, PWM_CONFIG_DSLEEP, 100 },
+ [PWM_CH_DISPLIGHT] = { 2, 0, 500 },
+ [PWM_CH_LED_GREEN] = { 6, PWM_CONFIG_DSLEEP, 100 },
};
BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT);
diff --git a/board/nefario/board.h b/board/nefario/board.h
index 24b290e4f3..5332b1dc1f 100644
--- a/board/nefario/board.h
+++ b/board/nefario/board.h
@@ -19,9 +19,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
@@ -212,7 +209,9 @@ enum adc_channel {
};
enum pwm_channel {
+ PWM_CH_LED_RED,
PWM_CH_DISPLIGHT,
+ PWM_CH_LED_GREEN,
/* Number of PWM channels */
PWM_CH_COUNT
};
diff --git a/board/nefario/build.mk b/board/nefario/build.mk
index 98be206edc..e4253538dd 100644
--- a/board/nefario/build.mk
+++ b/board/nefario/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/nefario/gpio.inc b/board/nefario/gpio.inc
index f359ba81ba..0e17cabc4f 100644
--- a/board/nefario/gpio.inc
+++ b/board/nefario/gpio.inc
@@ -141,10 +141,8 @@ ALTERNATE(PIN_MASK(8, 0x80), 1, MODULE_I2C, 0)
ALTERNATE(PIN_MASK(9, 0x07), 1, MODULE_I2C, 0)
/* I2C3SDA/I2C3SCL GPIOD0/D1 */
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)
+/* PWM6/PWM0/PWM2 GPIOC0/C3/C4 */
+ALTERNATE(PIN_MASK(C, 0x19), 1, MODULE_PWM, 0)
/* CR_SIN/SOUT GPIO64/65 */
ALTERNATE(PIN_MASK(6, 0x30), 1, MODULE_UART, GPIO_PULL_UP)
diff --git a/board/nefario/led.c b/board/nefario/led.c
new file mode 100644
index 0000000000..555c2a6576
--- /dev/null
+++ b/board/nefario/led.c
@@ -0,0 +1,118 @@
+/* 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 Nefario board.
+ */
+
+#include "battery.h"
+#include "charge_state.h"
+#include "chipset.h"
+#include "hooks.h"
+#include "led_common.h"
+#include "pwm.h"
+#include "util.h"
+
+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 */
+};
+
+/* Color v.s. brightness */
+static const uint8_t color_brightness[LED_COLOR_COUNT][2] = {
+ [LED_OFF] = {100, 100},
+ [LED_RED] = {80, 100},
+ [LED_AMBER] = {80, 80},
+ [LED_GREEN] = {100, 80},
+};
+
+static void bat_led_set_color(enum led_color color)
+{
+ pwm_set_duty(PWM_CH_LED_RED, color_brightness[color][0]);
+ pwm_set_duty(PWM_CH_LED_GREEN, color_brightness[color][1]);
+}
+
+static void nefario_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] = 100;
+ brightness_range[EC_LED_COLOR_GREEN] = 100;
+ }
+}
+
+int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
+{
+ if (led_id == EC_LED_ID_BATTERY_LED) {
+ pwm_set_duty(PWM_CH_LED_RED, brightness[EC_LED_COLOR_RED]);
+ pwm_set_duty(PWM_CH_LED_GREEN, brightness[EC_LED_COLOR_GREEN]);
+ return EC_SUCCESS;
+ }
+ return EC_ERROR_UNKNOWN;
+}
+
+static void led_init(void)
+{
+ pwm_enable(PWM_CH_LED_RED, 1);
+ pwm_enable(PWM_CH_LED_GREEN, 1);
+ bat_led_set_color(LED_OFF);
+}
+/* After pwm_pin_init() */
+DECLARE_HOOK(HOOK_INIT, led_init, HOOK_PRIO_DEFAULT);
+
+/* Called by hook task every 1 sec */
+static void led_second(void)
+{
+ if (led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED))
+ nefario_led_set_battery();
+}
+DECLARE_HOOK(HOOK_SECOND, led_second, HOOK_PRIO_DEFAULT);