summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@chromium.org>2017-08-23 18:44:43 -0700
committerchrome-bot <chrome-bot@chromium.org>2017-08-24 01:25:52 -0700
commitc859c057e16c13d637326e7fae333e1d1eb80d7a (patch)
tree27e344e3ac2e317cc0e8eb0700a6dc29a1fb99f7
parent4f21ee309c63db2084dd0c0122c5311636a3627e (diff)
downloadchrome-ec-c859c057e16c13d637326e7fae333e1d1eb80d7a.tar.gz
poppy: Enable base on sysjump
Now that we enable base only on chipset state transition, sysjump needs to be handled in a special way. On sysjump if chipset is already in S0, then enable base right away. BUG=b:64987346 BRANCH=None TEST=Verified that base is enabled and connected on sysjump. Tablet mode events work again in evtest. Change-Id: I917b0ca84d2735a4f2b32ecea3d310eccb7c008c Signed-off-by: Furquan Shaikh <furquan@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/631218 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
-rw-r--r--board/poppy/board.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/board/poppy/board.c b/board/poppy/board.c
index a2cbb5e8a0..7ad690bae5 100644
--- a/board/poppy/board.c
+++ b/board/poppy/board.c
@@ -598,6 +598,13 @@ static void board_init(void)
/* Enable pericom BC1.2 interrupts */
gpio_enable_interrupt(GPIO_USB_C0_BC12_INT_L);
gpio_enable_interrupt(GPIO_USB_C1_BC12_INT_L);
+
+ /*
+ * If we jumped to this image and chipset is already in S0, enable
+ * base.
+ */
+ if (system_jumped_to_this_image() && chipset_in_state(CHIPSET_STATE_ON))
+ base_enable();
}
DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT);