diff options
| author | Louis Yung-Chieh Lo <yjlou@chromium.org> | 2014-04-11 12:50:13 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-04-18 21:32:53 +0000 |
| commit | 2e41eb9eb9e9b816a12e58a42fb9b2a2ceeb8a36 (patch) | |
| tree | e1619c175f6f6bdfdf50bda898c2d3b569ae7b8e | |
| parent | b610695b61db3b3784e2a516c91f429139616100 (diff) | |
| download | chrome-ec-2e41eb9eb9e9b816a12e58a42fb9b2a2ceeb8a36.tar.gz | |
tegra: move to charger v2.
This would move all tegra boards to charger v2.
Also removed the unnecessary charge_keep_power_off(), which was
designed for USB power port and doesn't apply to Tegra platform.
BUG=none
BRANCH=nyan,big,blaze
TEST=build and run on nyan.
Change-Id: I9517a8885726ad6dce5a2865402da4b9551e009f
Signed-off-by: Louis Yung-Chieh Lo <yjlou@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/194384
Commit-Queue: Bill Richardson <wfrichar@chromium.org>
Reviewed-by: Devin Lu <Devin.Lu@quantatw.com>
Tested-by: Devin Lu <Devin.Lu@quantatw.com>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
| -rw-r--r-- | board/big/board.h | 2 | ||||
| -rw-r--r-- | board/blaze/board.h | 2 | ||||
| -rw-r--r-- | board/nyan/board.h | 2 | ||||
| -rw-r--r-- | power/tegra.c | 12 |
4 files changed, 3 insertions, 15 deletions
diff --git a/board/big/board.h b/board/big/board.h index a411d776e3..dd1373b50c 100644 --- a/board/big/board.h +++ b/board/big/board.h @@ -12,7 +12,7 @@ #define CONFIG_AP_HANG_DETECT #define CONFIG_BATTERY_SMART #define CONFIG_CHARGER -#define CONFIG_CHARGER_V1 +#define CONFIG_CHARGER_V2 #define CONFIG_CHARGER_BQ24725 #define CONFIG_CHIPSET_TEGRA #define CONFIG_POWER_COMMON diff --git a/board/blaze/board.h b/board/blaze/board.h index 93ebcffef1..f6c23dfe74 100644 --- a/board/blaze/board.h +++ b/board/blaze/board.h @@ -12,7 +12,7 @@ #define CONFIG_AP_HANG_DETECT #define CONFIG_BATTERY_SMART #define CONFIG_CHARGER -#define CONFIG_CHARGER_V1 +#define CONFIG_CHARGER_V2 #define CONFIG_CHARGER_BQ24725 #define CONFIG_CHIPSET_TEGRA #define CONFIG_POWER_COMMON diff --git a/board/nyan/board.h b/board/nyan/board.h index 0e9c4ea4eb..d8ae98bd77 100644 --- a/board/nyan/board.h +++ b/board/nyan/board.h @@ -12,7 +12,7 @@ #define CONFIG_AP_HANG_DETECT #define CONFIG_BATTERY_SMART #define CONFIG_CHARGER -#define CONFIG_CHARGER_V1 +#define CONFIG_CHARGER_V2 #define CONFIG_CHARGER_BQ24725 #define CONFIG_CHIPSET_TEGRA #define CONFIG_POWER_COMMON diff --git a/power/tegra.c b/power/tegra.c index 58f46ad8ab..b8d9a239f7 100644 --- a/power/tegra.c +++ b/power/tegra.c @@ -443,18 +443,6 @@ enum power_state power_handle_state(enum power_state state) value = check_for_power_on_event(); } -#ifdef HAS_TASK_CHARGER - /* - * If the system is already on (value == 1), the kernel - * would handle low power condition and we should not - * shutdown the system from EC. - */ - if (value != 1 && charge_keep_power_off()) { - CPRINTF("[%T power on ignored due to low battery]\n"); - return state; - } -#endif - if (value) { CPRINTF("[%T power on %d]\n", value); return POWER_S5S3; |