summaryrefslogtreecommitdiff
path: root/board/cr50/gpio.inc
diff options
context:
space:
mode:
authorMary Ruthven <mruthven@chromium.org>2016-09-06 17:11:33 +0000
committerVadim Bendebury <vbendeb@chromium.org>2016-09-06 17:15:17 +0000
commit03a3f864796d02196de8419b3c12c78f425b946c (patch)
tree9b698ddea3eac05f3e2c2b622de7fb5b857fc64b /board/cr50/gpio.inc
parentd5639272e2ed6b4478a39310c5aad6a4545509ad (diff)
downloadchrome-ec-03a3f864796d02196de8419b3c12c78f425b946c.tar.gz
Revert "cr50: remove internal pull up on DIOM0"
This reverts commit 5e6da91fe86301d276b452a660139c27c3786a82. Change-Id: I65b37c087a86fab06f6e23e895ceee2ae2def5ee Reviewed-on: https://chromium-review.googlesource.com/381160 Reviewed-by: Mary Ruthven <mruthven@chromium.org> Commit-Queue: Mary Ruthven <mruthven@chromium.org> Commit-Queue: Vadim Bendebury <vbendeb@chromium.org> Tested-by: Vadim Bendebury <vbendeb@chromium.org>
Diffstat (limited to 'board/cr50/gpio.inc')
-rw-r--r--board/cr50/gpio.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/board/cr50/gpio.inc b/board/cr50/gpio.inc
index 454fe729bc..e68124d561 100644
--- a/board/cr50/gpio.inc
+++ b/board/cr50/gpio.inc
@@ -11,8 +11,11 @@
* We can assert SYS_RST_L but so can the EC, so we need react if it's pulled
* low. The ARM core can't trigger an interrupt if it's driving it as an output
* so we attach two internal GPIOs to the same pad.
+ * TODO: Remove this internal pullup at some point. It's only here so that
+ * boards that don't have an external pullup don't trigger due to noise.
*/
-GPIO_INT(SYS_RST_L_IN, PIN(1, 0), GPIO_INT_FALLING, sys_rst_asserted)
+GPIO_INT(SYS_RST_L_IN, PIN(1, 0), GPIO_INT_FALLING | GPIO_PULL_UP,
+ sys_rst_asserted)
GPIO_INT(AP_ON, PIN(1, 1), GPIO_INT_RISING, device_state_on)
GPIO_INT(EC_ON, PIN(1, 2), GPIO_INT_RISING, device_state_on)
GPIO_INT(SERVO_UART1_ON, PIN(1, 3), GPIO_INT_RISING | GPIO_PULL_DOWN,