diff options
| author | Nicolas Boichat <drinkcat@chromium.org> | 2017-08-29 10:14:08 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-09-28 09:16:28 -0700 |
| commit | 86d5eb9b0a4c60fd47db2956b80d92b2fa922160 (patch) | |
| tree | 8efc80edafd1ae88c359bc8e91050e5fd61475c8 | |
| parent | 884b790a6560e13975395d1982aa5e6634e7842c (diff) | |
| download | chrome-ec-86d5eb9b0a4c60fd47db2956b80d92b2fa922160.tar.gz | |
poppy: cleanup GPIOs
- Deprecate poppy rev0.
- Remove FP_INT_L
BRANCH=none
BUG=b:65104436
TEST=make buildall -j
Change-Id: Ie2afae95a4fed43e8c2dc9e18031cf3e82eb3536
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/689817
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
| -rw-r--r-- | board/poppy/board.c | 6 | ||||
| -rw-r--r-- | board/poppy/board.h | 8 | ||||
| -rw-r--r-- | board/poppy/gpio.inc | 7 |
3 files changed, 0 insertions, 21 deletions
diff --git a/board/poppy/board.c b/board/poppy/board.c index 038edc8e21..5e712063ca 100644 --- a/board/poppy/board.c +++ b/board/poppy/board.c @@ -1026,9 +1026,6 @@ DECLARE_HOOK(HOOK_INIT, board_sensor_init, HOOK_PRIO_DEFAULT); static void board_chipset_resume(void) { gpio_set_level(GPIO_ENABLE_BACKLIGHT, 1); -#ifdef POPPY_REV0 - gpio_set_level(GPIO_PP3300_DX_CAM, 1); -#endif } DECLARE_HOOK(HOOK_CHIPSET_RESUME, board_chipset_resume, HOOK_PRIO_DEFAULT); @@ -1036,9 +1033,6 @@ DECLARE_HOOK(HOOK_CHIPSET_RESUME, board_chipset_resume, HOOK_PRIO_DEFAULT); static void board_chipset_suspend(void) { gpio_set_level(GPIO_ENABLE_BACKLIGHT, 0); -#ifdef POPPY_REV0 - gpio_set_level(GPIO_PP3300_DX_CAM, 0); -#endif } DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, board_chipset_suspend, HOOK_PRIO_DEFAULT); diff --git a/board/poppy/board.h b/board/poppy/board.h index 23a35f15d3..75188e056a 100644 --- a/board/poppy/board.h +++ b/board/poppy/board.h @@ -8,14 +8,6 @@ #ifndef __CROS_EC_BOARD_H #define __CROS_EC_BOARD_H -/* Set the default board revision */ -#ifdef BOARD_SORAKA -#define POPPY_REV1 -#else -/* TODO(b/35585396): Deprecate rev0 */ -#define POPPY_REV0 -#endif - /* * Allow dangerous commands. * TODO: Remove this config before production. diff --git a/board/poppy/gpio.inc b/board/poppy/gpio.inc index a0c61d3986..af7576029e 100644 --- a/board/poppy/gpio.inc +++ b/board/poppy/gpio.inc @@ -60,19 +60,12 @@ GPIO(PCH_SLP_S0_L, PIN(7, 5), GPIO_INPUT) /* Sensor interrupts, not implemented yet */ GPIO(ALS_INT_L, PIN(2, 5), GPIO_INPUT) -GPIO(FP_INT_L, PIN(5, 6), GPIO_INPUT) /* TODO(b/35585396): Make use of these GPIOs */ GPIO(PP1800_DX_SENSOR, PIN(1, 4), GPIO_OUTPUT) GPIO(PP3300_DX_SENSOR, PIN(2, 1), GPIO_OUTPUT) GPIO(PP3300_USB_PD, PIN(2, 0), GPIO_OUTPUT) -#ifdef POPPY_REV0 -GPIO(PP5000_DX_NFC, PIN(1, 5), GPIO_OUTPUT) -GPIO(PP3300_DX_CAM, PIN(1, 0), GPIO_OUT_HIGH) -GPIO(CAM_PMIC_RST_L, PIN(0, 7), GPIO_INPUT) -#endif - GPIO(WLAN_PE_RST, PIN(1, 2), GPIO_OUTPUT) GPIO(PP3300_DX_LTE, PIN(0, 5), GPIO_OUT_LOW) GPIO(LTE_GPS_OFF_L, PIN(0, 0), GPIO_ODR_HIGH) |