diff options
| author | Rachel Nancollas <rachelsn@google.com> | 2017-12-06 19:05:30 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-12-08 00:37:03 -0800 |
| commit | aa63578a25e2cc8b321d8f4868414b9628ec027a (patch) | |
| tree | dfd01642c9eea21e408cf9f4f9ca9582f69e2dac | |
| parent | 9133a1313fb02dff14fa245e9d9603a253c44c21 (diff) | |
| download | chrome-ec-aa63578a25e2cc8b321d8f4868414b9628ec027a.tar.gz | |
zoombini: Remove EN_PP3300_TRACKPAD from Zoombini.
Replaced EN_PP3300_TRACKPAD with EN_TOP_SWAP because we
moved the trackpad enable to the PCH and connected this
gpio to GPP_B14.
BUG=b:69139616
BRANCH=None
TEST=make board=zoombini, make board=meowth
TEST=Zoombini boots to Port80 codes on a cold reset.
Change-Id: Id714986fbccfeb3db6ced85459505c5b9297d217
Signed-off-by: Rachel Nancollas <rachelsn@google.com>
Reviewed-on: https://chromium-review.googlesource.com/814878
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
| -rw-r--r-- | board/zoombini/board.c | 16 | ||||
| -rw-r--r-- | board/zoombini/gpio.inc | 2 |
2 files changed, 5 insertions, 13 deletions
diff --git a/board/zoombini/board.c b/board/zoombini/board.c index f3d6ae1012..77bff678e8 100644 --- a/board/zoombini/board.c +++ b/board/zoombini/board.c @@ -225,25 +225,17 @@ DECLARE_HOOK(HOOK_CHIPSET_RESUME, board_chipset_resume, HOOK_PRIO_DEFAULT); static void board_chipset_startup(void) { -#ifdef BOARD_ZOOMBINI - /* Enable trackpad. */ - gpio_set_level(GPIO_EN_PP3300_TRACKPAD, 1); - /* TODO(aaboagye): Remove Trackpad function in P1 - moved to AP */ -#else /* !defined(BOARD_ZOOMBINI) */ +#ifdef BOARD_MEOWTH gpio_set_level(GPIO_EN_PP1800_U, 1); -#endif /* defined(BOARD_ZOOMBINI) */ +#endif /* defined(BOARD_MEOWTH) */ } DECLARE_HOOK(HOOK_CHIPSET_STARTUP, board_chipset_startup, HOOK_PRIO_DEFAULT); static void board_chipset_shutdown(void) { -#ifdef BOARD_ZOOMBINI - /* Disable trackpad. */ - gpio_set_level(GPIO_EN_PP3300_TRACKPAD, 0); - /* TODO(aaboagye): Remove Trackpad function in P1 - moved to AP */ -#else /* !defined(BOARD_ZOOMBINI) */ +#ifdef BOARD_MEOWTH gpio_set_level(GPIO_EN_PP1800_U, 0); -#endif /* defined(BOARD_ZOOMBINI) */ +#endif /* defined(BOARD_MEOWTH ) */ } DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, board_chipset_shutdown, HOOK_PRIO_DEFAULT); diff --git a/board/zoombini/gpio.inc b/board/zoombini/gpio.inc index 040e8e9e70..783c8b7d1a 100644 --- a/board/zoombini/gpio.inc +++ b/board/zoombini/gpio.inc @@ -36,7 +36,6 @@ GPIO_INT(VOLUME_DOWN_L, PIN(4, 1), GPIO_INT_BOTH | GPIO_PULL_UP, button_interr /* Power Enables. */ GPIO(EN_PP3300_DSW, PIN(6, 0), GPIO_OUT_HIGH) -GPIO(EN_PP3300_TRACKPAD, PIN(B, 7), GPIO_OUT_LOW) GPIO(EN_PP5000, PIN(7, 3), GPIO_OUT_LOW) GPIO(ENTERING_RW, PIN(E, 1), GPIO_OUT_LOW) @@ -48,6 +47,7 @@ GPIO(ENABLE_BACKLIGHT, PIN(D, 3), GPIO_ODR_LOW) /* EC_BL_EN_OD */ GPIO(PCH_DSW_PWROK, PIN(3, 7), GPIO_OUT_LOW) /* EC_PCH_DSW_PWROK */ GPIO(PCH_RSMRST_L, PIN(C, 2), GPIO_OUT_LOW) /* EC_PCH_RSMRST_L */ GPIO(PCH_RTCRST, PIN(7, 6), GPIO_OUT_LOW) /* EC_PCH_RTCRST */ +GPIO(EN_TOP_SWAP, PIN(B, 7), GPIO_INPUT) /* GPP_B14_STRAP */ GPIO(PCH_PWRBTN_L, PIN(C, 1), GPIO_ODR_HIGH) /* EC_PCH_PWR_BTN_ODL */ GPIO(PCH_WAKE_L, PIN(7, 4), GPIO_ODR_HIGH) /* EC_PCH_WAKE_ODL */ GPIO(CPU_PROCHOT, PIN(3, 4), GPIO_INPUT) /* PCH_PROCHOT_ODL */ |