diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2015-08-13 08:50:00 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-08-14 21:04:48 +0000 |
| commit | 4e355700aa97adff9b3c848660511cbe825dc4b3 (patch) | |
| tree | 668a2ca2a1888513a723abcb7d71824153f5ac11 /power/skylake.c | |
| parent | 571b7bb640522e341ca3c95fb708c5a1ae4f74a8 (diff) | |
| download | chrome-ec-4e355700aa97adff9b3c848660511cbe825dc4b3.tar.gz | |
glados: Switch to V2 board
Switch to V2 glados as the default, and remove support for V1.
BUG=chrome-os-partner:43075
TEST=`make buildall -j`
BRANCH=None
Change-Id: I58f33225177d259916e8877084c2c431922e7bc5
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/293303
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Diffstat (limited to 'power/skylake.c')
| -rw-r--r-- | power/skylake.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/power/skylake.c b/power/skylake.c index b30961e689..d0fafb0bc2 100644 --- a/power/skylake.c +++ b/power/skylake.c @@ -65,7 +65,11 @@ void chipset_force_shutdown(void) void chipset_force_g3(void) { CPRINTS("Forcing G3"); -#ifdef GLADOS_BOARD_V2 + /* + * Kunimitsu doesn't yet have pass-thru SLP_SUS_L / BATLOW. + * TODO(crosbug.com/p/43075): Remove this when new boards roll out. + */ +#ifndef BOARD_KUNIMITSU gpio_set_level(GPIO_PMIC_SLP_SUS_L, 0); gpio_set_level(GPIO_PCH_BATLOW_L, 0); #endif @@ -132,7 +136,7 @@ enum power_state power_handle_state(enum power_state state) */ int rsmrst_in = gpio_get_level(GPIO_RSMRST_L_PGOOD); int rsmrst_out = gpio_get_level(GPIO_PCH_RSMRST_L); -#ifdef GLADOS_BOARD_V2 +#ifndef BOARD_KUNIMITSU int tries = 0; #endif @@ -193,7 +197,7 @@ enum power_state power_handle_state(enum power_state state) return POWER_G3; } -#ifdef GLADOS_BOARD_V2 +#ifndef BOARD_KUNIMITSU /* * Allow up to 1s for charger to be initialized, in case * we're trying to boot the AP with no battery. |