diff options
| author | Zick Wei <zick.wei@quanta.corp-partner.google.com> | 2020-11-02 15:16:03 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-11-03 10:15:41 +0000 |
| commit | 8e7bfda78ebf723aee95674c86b33b6deec9365d (patch) | |
| tree | bb8b45e64458dbaaec3b38b1d6083da6115a4bd7 /board/dooly | |
| parent | 684642811f23490f52128d5e80140c410e786c37 (diff) | |
| download | chrome-ec-8e7bfda78ebf723aee95674c86b33b6deec9365d.tar.gz | |
dooly: update volume down gpio
In previous CL:2504123, we replace volume down button gpio after
EC get board version from CBI, which is too late for interrupt initial,
so we fix volume down button on GPIO93.
BUG=b:172034756
BRANCH=puff
TEST=verify volume down button work on board version 2.
Signed-off-by: Zick Wei <zick.wei@quanta.corp-partner.google.com>
Change-Id: Ib9deae601a00efc8df456bd6c382e4e0d95ea2a9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2513413
Commit-Queue: Andrew McRae <amcrae@chromium.org>
Reviewed-by: Andrew McRae <amcrae@chromium.org>
Diffstat (limited to 'board/dooly')
| -rw-r--r-- | board/dooly/board.c | 3 | ||||
| -rw-r--r-- | board/dooly/board.h | 1 | ||||
| -rw-r--r-- | board/dooly/gpio.inc | 3 |
3 files changed, 1 insertions, 6 deletions
diff --git a/board/dooly/board.c b/board/dooly/board.c index e082d7fb63..7ff5ea661a 100644 --- a/board/dooly/board.c +++ b/board/dooly/board.c @@ -641,9 +641,6 @@ static void board_init(void) /* Always claim AC is online, because we don't have a battery. */ memmap_batt_flags = host_get_memmap(EC_MEMMAP_BATT_FLAG); *memmap_batt_flags |= EC_BATT_FLAG_AC_PRESENT; - - if (board_version >= 1) - buttons[BUTTON_VOLUME_DOWN].gpio = GPIO_EC_VOLDN_BTN_ODL_V1; } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); diff --git a/board/dooly/board.h b/board/dooly/board.h index 62103eb5c2..b49c6457cf 100644 --- a/board/dooly/board.h +++ b/board/dooly/board.h @@ -52,7 +52,6 @@ #define CONFIG_ADC #define CONFIG_BOARD_HAS_RTC_RESET #define CONFIG_BOARD_VERSION_CBI -#define CONFIG_BUTTONS_RUNTIME_CONFIG #define CONFIG_DEDICATED_RECOVERY_BUTTON #define CONFIG_BOARD_RESET_AFTER_POWER_ON #define CONFIG_CRC8 diff --git a/board/dooly/gpio.inc b/board/dooly/gpio.inc index 5f5ecc4f5a..2b71948401 100644 --- a/board/dooly/gpio.inc +++ b/board/dooly/gpio.inc @@ -62,8 +62,7 @@ GPIO_INT(USB_A0_OC_ODL, PIN(F, 5), GPIO_INT_BOTH, port_ocp_interrupt) GPIO_INT(USB_A1_OC_ODL, PIN(0, 3), GPIO_INT_BOTH, port_ocp_interrupt) /* Volume button interrupts */ -GPIO_INT(EC_VOLDN_BTN_ODL, PIN(C, 3), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) -GPIO_INT(EC_VOLDN_BTN_ODL_V1, PIN(9, 3), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) +GPIO_INT(EC_VOLDN_BTN_ODL, PIN(9, 3), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) GPIO_INT(EC_VOLUP_BTN_ODL, PIN(8, 0), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) /* PCH/CPU signals */ |