summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hill <ecgh@chromium.org>2019-10-21 17:09:40 -0600
committerCommit Bot <commit-bot@chromium.org>2019-10-22 21:56:36 +0000
commit495cbd7357bceeb544dfcbbbc4e3ce853e70b9d0 (patch)
tree21e4a036380edcb29502a579a2cc69ecb6264552
parent404b41004f927f97cd2a805026c18348d9de9430 (diff)
downloadchrome-ec-495cbd7357bceeb544dfcbbbc4e3ce853e70b9d0.tar.gz
Grunt: Add GPIO_LOCKED to EC_RST_ODL PSL input
BRANCH=grunt BUG=b:143095616 TEST=GPIO is locked as input Change-Id: I36b123ed068db268d1cd02e990dd720663eaae57 Signed-off-by: Edward Hill <ecgh@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1873008 Reviewed-by: Keith Short <keithshort@chromium.org> (cherry picked from commit e78c4c3c1e0839ba915e15ee2e711e4c0e5bb5d5) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1874585
-rw-r--r--board/aleena/gpio.inc2
-rw-r--r--board/careena/gpio.inc2
-rw-r--r--board/liara/gpio.inc2
-rw-r--r--board/treeya/gpio.inc2
4 files changed, 4 insertions, 4 deletions
diff --git a/board/aleena/gpio.inc b/board/aleena/gpio.inc
index 37f8b5332b..e5cf59ba53 100644
--- a/board/aleena/gpio.inc
+++ b/board/aleena/gpio.inc
@@ -26,7 +26,7 @@ GPIO_INT(USB_C0_CABLE_DET, PIN(3, 7), GPIO_INT_RISING, anx74xx_cable_det_inter
GPIO_INT(6AXIS_INT_L, PIN(8, 6), GPIO_INT_FALLING | GPIO_SEL_1P8V, bmi160_interrupt)
/* GPIO_INT_BOTH is required for PSL wake from hibernate, but we don't need an interrupt handler. */
-GPIO(EC_RST_ODL, PIN(0, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH)
+GPIO(EC_RST_ODL, PIN(0, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH | GPIO_LOCKED)
GPIO(EN_PWR_A, PIN(E, 2), GPIO_OUT_LOW) /* Enable Power */
GPIO(EN_PP1800_SENSOR, PIN(6, 7), GPIO_OUT_LOW) /* Enable Power */
diff --git a/board/careena/gpio.inc b/board/careena/gpio.inc
index 9ef8038978..4b9efe9f09 100644
--- a/board/careena/gpio.inc
+++ b/board/careena/gpio.inc
@@ -25,7 +25,7 @@ GPIO_INT(VOLUME_UP_L, PIN(7, 5), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt
GPIO_INT(USB_C0_CABLE_DET, PIN(3, 7), GPIO_INT_RISING, anx74xx_cable_det_interrupt)
/* GPIO_INT_BOTH is required for PSL wake from hibernate, but we don't need an interrupt handler. */
-GPIO(EC_RST_ODL, PIN(0, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH)
+GPIO(EC_RST_ODL, PIN(0, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH | GPIO_LOCKED)
GPIO(EN_PWR_A, PIN(E, 2), GPIO_OUT_LOW) /* Enable Power */
GPIO(EN_PP1800_SENSOR, PIN(6, 7), GPIO_OUT_LOW) /* Enable Power */
diff --git a/board/liara/gpio.inc b/board/liara/gpio.inc
index 9516007e97..343c50f503 100644
--- a/board/liara/gpio.inc
+++ b/board/liara/gpio.inc
@@ -25,7 +25,7 @@ GPIO_INT(VOLUME_UP_L, PIN(7, 5), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt
GPIO_INT(USB_C0_CABLE_DET, PIN(3, 7), GPIO_INT_RISING, anx74xx_cable_det_interrupt)
/* GPIO_INT_BOTH is required for PSL wake from hibernate, but we don't need an interrupt handler. */
-GPIO(EC_RST_ODL, PIN(0, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH)
+GPIO(EC_RST_ODL, PIN(0, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH | GPIO_LOCKED)
GPIO(EN_PWR_A, PIN(E, 2), GPIO_OUT_LOW) /* Enable Power */
GPIO(EN_PP1800_SENSOR, PIN(6, 7), GPIO_OUT_LOW) /* Enable Power */
diff --git a/board/treeya/gpio.inc b/board/treeya/gpio.inc
index 3ccdbfaf7f..70e2e1b29c 100644
--- a/board/treeya/gpio.inc
+++ b/board/treeya/gpio.inc
@@ -25,7 +25,7 @@ GPIO_INT(VOLUME_UP_L, PIN(7, 5), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt
GPIO_INT(6AXIS_INT_L, PIN(8, 6), GPIO_INT_FALLING | GPIO_SEL_1P8V, board_bmi160_lsm6dsm_interrupt)
/* GPIO_INT_BOTH is required for PSL wake from hibernate, but we don't need an interrupt handler. */
-GPIO(EC_RST_ODL, PIN(0, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH)
+GPIO(EC_RST_ODL, PIN(0, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH | GPIO_LOCKED)
GPIO(EN_PWR_A, PIN(E, 2), GPIO_OUT_LOW) /* Enable Power */
GPIO(EN_PP1800_SENSOR, PIN(6, 7), GPIO_OUT_LOW) /* Enable Power */