summaryrefslogtreecommitdiff
path: root/board/spring
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2013-03-19 16:07:20 -0700
committerChromeBot <chrome-bot@google.com>2013-03-20 17:42:04 -0700
commit22ff9df91367d6b74ab08521a6fc0b7293c8eaf9 (patch)
tree5e50b5a1e15a30c9c8f9ccee4650cd410537fe0f /board/spring
parentf8393fab2c63e4c85646a56bfcd44d42db89e13c (diff)
downloadchrome-ec-22ff9df91367d6b74ab08521a6fc0b7293c8eaf9.tar.gz
Move battery LED code on spring to common
It's not board-specific, so move it out of board.c. No functional changes; this is just moving code and renaming a few functions. BUG=chrome-os-partner:18256 BRANCH=none TEST=build spring Change-Id: Ib004066aed93745cb0c96d3cb45d70b728545492 Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/45918
Diffstat (limited to 'board/spring')
-rw-r--r--board/spring/board.c126
-rw-r--r--board/spring/usb_charging.c1
2 files changed, 0 insertions, 127 deletions
diff --git a/board/spring/board.c b/board/spring/board.c
index 82be07121f..cdb7abe3d7 100644
--- a/board/spring/board.c
+++ b/board/spring/board.c
@@ -16,10 +16,8 @@
#include "host_command.h"
#include "i2c.h"
#include "keyboard_scan.h"
-#include "lp5562.h"
#include "pmu_tpschrome.h"
#include "registers.h"
-#include "smart_battery.h"
#include "stm32_adc.h"
#include "timer.h"
#include "util.h"
@@ -32,21 +30,6 @@
#define HARD_RESET_TIMEOUT_MS 5
-/* We use yellow LED instead of blue LED. Re-map colors here. */
-#define LED_COLOR_NONE LP5562_COLOR_NONE
-#define LED_COLOR_GREEN LP5562_COLOR_GREEN
-#define LED_COLOR_YELLOW LP5562_COLOR_BLUE
-#define LED_COLOR_RED LP5562_COLOR_RED
-
-/* LED breathing program */
-uint8_t breathing_prog[] = {0x41, 0xff, /* 0x80 -> 0x0 */
- 0x41, 0x7f, /* 0x0 -> 0x80 */
- 0x7f, 0x00, /* Wait ~4s */
- 0x7f, 0x00,
- 0x7f, 0x00,
- 0x7f, 0x00,
- 0x00, 0x00}; /* Repeat */
-
void usb_charge_interrupt(enum gpio_signal signal);
/* GPIO signal list. Must match order from enum gpio_signal. */
@@ -311,115 +294,6 @@ int extpower_is_present(void)
return vbus_good;
}
-
-int board_led_breathing(int enabled)
-{
- int ret = 0;
-
- if (enabled) {
- ret |= lp5562_engine_load(LP5562_ENG_SEL_1,
- breathing_prog,
- sizeof(breathing_prog));
- ret |= lp5562_engine_control(LP5562_ENG_RUN,
- LP5562_ENG_HOLD,
- LP5562_ENG_HOLD);
- ret |= lp5562_set_engine(LP5562_ENG_SEL_NONE,
- LP5562_ENG_SEL_NONE,
- LP5562_ENG_SEL_1);
- } else {
- ret |= lp5562_engine_control(LP5562_ENG_HOLD,
- LP5562_ENG_HOLD,
- LP5562_ENG_HOLD);
- ret |= lp5562_set_engine(LP5562_ENG_SEL_NONE,
- LP5562_ENG_SEL_NONE,
- LP5562_ENG_SEL_NONE);
- }
-
- return ret;
-}
-
-static void board_battery_led_update(void)
-{
- int current;
- int desired_current;
-
- /* Current states and next states */
- static uint32_t color = LED_COLOR_RED;
- static int breathing;
- static int led_power;
- int new_color = LED_COLOR_RED;
- int new_breathing = 0;
- int new_led_power;
-
- /* Determine LED power */
- new_led_power = extpower_is_present();
- if (new_led_power != led_power) {
- led_power = new_led_power;
- if (new_led_power) {
- lp5562_poweron();
- } else {
- color = LED_COLOR_NONE;
- if (breathing) {
- board_led_breathing(0);
- breathing = 0;
- }
- lp5562_poweroff();
- }
- }
- if (!new_led_power)
- return;
-
- /*
- * LED power is controlled by accessory detection. We only
- * set color here.
- */
- switch (charge_get_state()) {
- case ST_IDLE:
- new_color = LED_COLOR_GREEN;
- break;
- case ST_DISCHARGING:
- /* Discharging with AC, must be battery assist */
- new_color = LED_COLOR_YELLOW;
- new_breathing = 1;
- break;
- case ST_PRE_CHARGING:
- new_color = LED_COLOR_YELLOW;
- break;
- case ST_CHARGING:
- if (battery_current(&current) ||
- battery_desired_current(&desired_current)) {
- /* Cannot talk to the battery. Set LED to red. */
- new_color = LED_COLOR_RED;
- break;
- }
-
- if (current < 0 && desired_current > 0) { /* Battery assist */
- new_breathing = 1;
- new_color = LED_COLOR_YELLOW;
- break;
- }
-
- if (current && desired_current)
- new_color = LED_COLOR_YELLOW;
- else
- new_color = LED_COLOR_GREEN;
- break;
- case ST_CHARGING_ERROR:
- new_color = LED_COLOR_RED;
- break;
- }
-
- if (new_color != color) {
- lp5562_set_color(new_color);
- color = new_color;
- }
- if (new_breathing != breathing) {
- board_led_breathing(new_breathing);
- breathing = new_breathing;
- }
-}
-DECLARE_HOOK(HOOK_SECOND, board_battery_led_update, HOOK_PRIO_DEFAULT);
-
/*****************************************************************************/
/* Host commands */
diff --git a/board/spring/usb_charging.c b/board/spring/usb_charging.c
index 1818b4a489..7d9d5e168f 100644
--- a/board/spring/usb_charging.c
+++ b/board/spring/usb_charging.c
@@ -10,7 +10,6 @@
#include "console.h"
#include "hooks.h"
#include "gpio.h"
-#include "lp5562.h"
#include "keyboard_scan.h"
#include "pmu_tpschrome.h"
#include "registers.h"