diff options
| author | Kevin K Wong <kevin.k.wong@intel.com> | 2015-11-24 12:37:10 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-11-26 03:25:36 -0800 |
| commit | d8a516cb9ab8a8dc53682cae3509629a9b2781a9 (patch) | |
| tree | 2d9a047cea9db1dd1007e60863003b24eb07e600 /power/skylake.c | |
| parent | f14dd412ce2ae44ac3ad1648a447a25077dbd82f (diff) | |
| download | chrome-ec-d8a516cb9ab8a8dc53682cae3509629a9b2781a9.tar.gz | |
kunimitsu: remove fab 3 related changes
BUG=chrome-os-partner:44704
BRANCH=none
TEST=verified image can boot on kunimitsu fab 4
Change-Id: If5f48bdd5dee5998fec2c079ee46f34cb604fd38
Signed-off-by: Kevin K Wong <kevin.k.wong@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/314126
Reviewed-by: Shawn N <shawnn@chromium.org>
Diffstat (limited to 'power/skylake.c')
| -rw-r--r-- | power/skylake.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/power/skylake.c b/power/skylake.c index f241ad25dd..70441de5fb 100644 --- a/power/skylake.c +++ b/power/skylake.c @@ -73,13 +73,8 @@ void chipset_force_shutdown(void) static void chipset_force_g3(void) { CPRINTS("Forcing fake G3."); - /* - * Kunimitsu doesn't yet have pass-thru SLP_SUS_L. - * TODO(crosbug.com/p/43075): Remove this when new boards roll out. - */ -#ifndef BOARD_KUNIMITSU_V3 + gpio_set_level(GPIO_PMIC_SLP_SUS_L, 0); -#endif } void chipset_reset(int cold_reset) @@ -137,9 +132,7 @@ enum power_state power_chipset_init(void) static enum power_state _power_handle_state(enum power_state state) { -#ifndef BOARD_KUNIMITSU_V3 int tries = 0; -#endif switch (state) { case POWER_G3: @@ -201,7 +194,6 @@ static enum power_state _power_handle_state(enum power_state state) /* Call hooks to initialize PMIC */ hook_notify(HOOK_CHIPSET_PRE_INIT); -#ifndef BOARD_KUNIMITSU_V3 /* * Allow up to 1s for charger to be initialized, in case * we're trying to boot the AP with no battery. @@ -218,7 +210,6 @@ static enum power_state _power_handle_state(enum power_state state) chipset_force_shutdown(); return POWER_G3; } -#endif if (power_wait_signals(IN_PCH_SLP_SUS_DEASSERTED)) { chipset_force_shutdown(); @@ -363,9 +354,7 @@ static void handle_slp_sus(enum power_state state) return; /* Always mimic PCH SLP_SUS request for all other states. */ -#ifndef BOARD_KUNIMITSU_V3 gpio_set_level(GPIO_PMIC_SLP_SUS_L, gpio_get_level(GPIO_PCH_SLP_SUS_L)); -#endif } enum power_state power_handle_state(enum power_state state) |