diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2015-05-15 12:00:42 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-05-16 03:00:16 +0000 |
| commit | 0a71b4418da9d2c2b26f38e2f30c012bfc13bcd4 (patch) | |
| tree | 545eb13033324ce69972634daeb4462fd65cf9dc /board/cyan | |
| parent | b4cbe7d377c176835274efdbe2fd384aaa9dcdee (diff) | |
| download | chrome-ec-0a71b4418da9d2c2b26f38e2f30c012bfc13bcd4.tar.gz | |
cleanup: Use CONFIG_BATTERY_CUT_OFF for supported boards
Common battery cut-off host command / console command infrastructure
already exists behind CONFIG_BATTERY_CUT_OFF, so add the config rather
duplicating the code at the board level.
BUG=chromium:488157
TEST=Manual on Squawks. Verify that both "cutoff" on the ec console and
"ectool batterycutoff" succeed to cut-off the battery.
BRANCH=None
Change-Id: I159026d54924e058ea0262db04d8770c663ee613
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/271513
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'board/cyan')
| -rw-r--r-- | board/cyan/battery.c | 22 | ||||
| -rw-r--r-- | board/cyan/board.h | 1 |
2 files changed, 2 insertions, 21 deletions
diff --git a/board/cyan/battery.c b/board/cyan/battery.c index bc3a63971e..d0e9dc78e9 100644 --- a/board/cyan/battery.c +++ b/board/cyan/battery.c @@ -7,10 +7,6 @@ #include "battery.h" #include "battery_smart.h" -#include "console.h" -#include "gpio.h" -#include "host_command.h" -#include "util.h" /* Shutdown mode parameter to write to manufacturer access register */ #define SB_SHUTDOWN_DATA 0x0010 @@ -33,7 +29,7 @@ const struct battery_info *battery_get_info(void) return &info; } -static int cutoff(void) +int board_cut_off_battery(void) { int rv; @@ -45,19 +41,3 @@ static int cutoff(void) return sb_write(SB_MANUFACTURER_ACCESS, SB_SHUTDOWN_DATA); } - -static int battery_command_cut_off(struct host_cmd_handler_args *args) -{ - return cutoff() ? EC_RES_ERROR : EC_RES_SUCCESS; -} -DECLARE_HOST_COMMAND(EC_CMD_BATTERY_CUT_OFF, battery_command_cut_off, - EC_VER_MASK(0)); - -static int command_battcutoff(int argc, char **argv) -{ - return cutoff(); -} -DECLARE_CONSOLE_COMMAND(battcutoff, command_battcutoff, - NULL, - "Enable battery cutoff (ship mode)", - NULL); diff --git a/board/cyan/board.h b/board/cyan/board.h index d5cc450192..320aa798a0 100644 --- a/board/cyan/board.h +++ b/board/cyan/board.h @@ -31,6 +31,7 @@ #define CONFIG_WAKE_PIN GPIO_POWER_BUTTON_L #define CONFIG_CHARGER +#define CONFIG_BATTERY_CUT_OFF #define CONFIG_BATTERY_SMART #define CONFIG_CHARGER_V2 #define CONFIG_CHARGER_BQ24770 |