summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schneider <dnschneid@chromium.org>2020-01-23 14:36:45 -0800
committerCommit Bot <commit-bot@chromium.org>2020-01-24 11:19:18 +0000
commite5605acefadc9517b0475b91685e9c2a1ced7c48 (patch)
treee609649fe8f162d92c31df382207cc2561b52b68
parent07fd9cc41e3aba4eb3e82f50d03d9ff738ced2b3 (diff)
downloadchrome-ec-e5605acefadc9517b0475b91685e9c2a1ced7c48.tar.gz
waddledoo: don't enable pull-ups with low-voltage mode
It is not valid on the NPCX7 to simultaneously use low-voltage mode and enable the pull-up, so pull-ups were being ignored. This caused spurious volume up and volume down button presses. Prochot is similarly misconfigured and really should be an ADC input, but for now just remove the pull-up. These changes have been updated on the EC pinout table as well. BUG=None BRANCH=None TEST=press buttons on waddledoo Change-Id: I8fd6e13d0e0ca79dbb777563443da0858ac62187 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2018033 Tested-by: David Schneider <dnschneid@chromium.org> Auto-Submit: David Schneider <dnschneid@chromium.org> Reviewed-by: Diana Z <dzigterman@chromium.org> Commit-Queue: Diana Z <dzigterman@chromium.org>
-rw-r--r--board/waddledoo/gpio.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/board/waddledoo/gpio.inc b/board/waddledoo/gpio.inc
index f66fa5292b..92d33ab341 100644
--- a/board/waddledoo/gpio.inc
+++ b/board/waddledoo/gpio.inc
@@ -29,9 +29,9 @@ GPIO_INT(SUB_USB_C1_INT_ODL, PIN(F, 5), GPIO_INT_FALLING | GPIO_PULL_UP, sub_us
/* Button interrupts */
GPIO_INT(H1_EC_PWR_BTN_ODL, PIN(0, 1), GPIO_INT_BOTH | GPIO_PULL_UP, power_button_interrupt)
-GPIO_INT(VOLDN_BTN_ODL, PIN(4, 0), GPIO_INT_BOTH | GPIO_PULL_UP | GPIO_SEL_1P8V, button_interrupt)
+GPIO_INT(VOLDN_BTN_ODL, PIN(4, 0), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt)
/* TODO(b:147257497) Fix this and EN_PP5000_U before board rev 0. */
-GPIO_INT(VOLUP_BTN_ODL, PIN(A, 4), GPIO_INT_BOTH | GPIO_PULL_UP | GPIO_SEL_1P8V, button_interrupt)
+GPIO_INT(VOLUP_BTN_ODL, PIN(A, 4), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt)
/* Other interrupts */
GPIO_INT(LID_OPEN, PIN(D, 2), GPIO_INT_BOTH, lid_interrupt)
@@ -78,7 +78,7 @@ GPIO(EC_AP_PCH_PWROK_OD, PIN(9, 4), GPIO_ODR_LOW)
GPIO(EC_AP_VCCST_PWRGD_OD, PIN(B, 1), GPIO_ODR_LOW)
GPIO(EC_AP_SYS_PWROK, PIN(0, 2), GPIO_OUT_LOW)
GPIO(EC_AP_MKBP_INT_L, PIN(7, 0), GPIO_OUT_HIGH)
-GPIO(EC_PROCHOT_ODL, PIN(F, 1), GPIO_ODR_HIGH | GPIO_PULL_UP | GPIO_SEL_1P8V)
+GPIO(EC_PROCHOT_ODL, PIN(F, 1), GPIO_ODR_HIGH | GPIO_SEL_1P8V)
GPIO(EC_ENTERING_RW, PIN(E, 3), GPIO_OUT_LOW)
GPIO(ALL_SYS_PWRGD, PIN(A, 0), GPIO_OUT_LOW)
GPIO(SYS_RST_ODL, PIN(C, 5), GPIO_ODR_HIGH)