summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLouis Yung-Chieh Lo <yjlou@chromium.org>2014-02-14 11:02:47 +0800
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-02-14 17:46:34 +0000
commite43074ebcf3349819b118aceeb422716100c2718 (patch)
tree364408a74242e41c5f321bcb5dc674fdc98b1020
parente7e0cf2cae2794437c4c71884b54c96cb6caf9b5 (diff)
downloadchrome-ec-e43074ebcf3349819b118aceeb422716100c2718.tar.gz
cleanup: nyan: remove unnecessary dependence to pmu_tpschrome.h
Nyan uses common/charge_state instead. So, fix the dependence. Since snow/spring/pit are using common/pmu_tps65090_charger, keep them. BUG=None BRANCH=Nyan TEST=build and works fine on Nyan 3.2 Change-Id: I985f7980578ac22602b1fbffa51edf039078bc05 Signed-off-by: Louis Yung-Chieh Lo <yjlou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/186337 Reviewed-by: Randall Spangler <rspangler@chromium.org>
-rw-r--r--board/nyan/board.c1
-rw-r--r--include/charge_state.h5
-rw-r--r--power/tegra.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/board/nyan/board.c b/board/nyan/board.c
index 7813af3a2b..7aabae2491 100644
--- a/board/nyan/board.c
+++ b/board/nyan/board.c
@@ -12,7 +12,6 @@
#include "i2c.h"
#include "keyboard_raw.h"
#include "lid_switch.h"
-#include "pmu_tpschrome.h"
#include "power.h"
#include "power_button.h"
#include "power.h"
diff --git a/include/charge_state.h b/include/charge_state.h
index 152e767295..47ce682d01 100644
--- a/include/charge_state.h
+++ b/include/charge_state.h
@@ -126,6 +126,11 @@ struct charge_state_context {
enum charge_state charge_get_state(void);
/**
+ * Return non-zero if battery is so low we want to keep AP off.
+ */
+int charge_keep_power_off(void);
+
+/**
* Return current charge state flags (CHARGE_FLAG_*)
*/
uint32_t charge_get_flags(void);
diff --git a/power/tegra.c b/power/tegra.c
index 79cd1e5899..021626ee93 100644
--- a/power/tegra.c
+++ b/power/tegra.c
@@ -25,6 +25,7 @@
*
*/
+#include "charge_state.h"
#include "chipset.h" /* This module implements chipset functions too */
#include "clock.h"
#include "common.h"
@@ -36,7 +37,6 @@
#include "power.h"
#include "power_button.h"
#include "power_led.h"
-#include "pmu_tpschrome.h"
#include "system.h"
#include "task.h"
#include "timer.h"