summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam McNally <sammc@chromium.org>2023-02-13 11:15:07 +1100
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-02-21 06:20:30 +0000
commit497a25b4185deb0143bc2c6963552643d824bc26 (patch)
tree098e9005510603e52e2961e890d388311341f3e7
parent1e4ac3b7d6bcaca171b8522d99317dc3272529f2 (diff)
downloadchrome-ec-497a25b4185deb0143bc2c6963552643d824bc26.tar.gz
dibbi: Change EC_RECOVERY_BTN_OD to active high.
EC_RECOVERY_BTN_OD is active-high, so set the recovery button flags for this signal to BUTTON_FLAG_ACTIVE_HIGH. BUG=b:268309238 TEST=dibbi boots in normal mode BRANCH=none Change-Id: Id7f7e65e0e3a35097de4865a8578bd0b47aea5eb Signed-off-by: Sam McNally <sammc@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4240911 Reviewed-by: Peter Marheine <pmarheine@chromium.org>
-rw-r--r--board/dibbi/board.h3
-rw-r--r--board/dibbi/gpio.inc2
2 files changed, 3 insertions, 2 deletions
diff --git a/board/dibbi/board.h b/board/dibbi/board.h
index 70936fd760..06c6b9ebb5 100644
--- a/board/dibbi/board.h
+++ b/board/dibbi/board.h
@@ -93,6 +93,7 @@
/* Buttons */
#define CONFIG_DEDICATED_RECOVERY_BUTTON
#define CONFIG_DEDICATED_RECOVERY_BUTTON_2
+#define CONFIG_DEDICATED_RECOVERY_BUTTON_FLAGS BUTTON_FLAG_ACTIVE_HIGH
#define CONFIG_POWER_BUTTON
#define CONFIG_POWER_BUTTON_IGNORE_LID
#define CONFIG_POWER_BUTTON_X86
@@ -125,7 +126,7 @@
#undef GPIO_USB_C1_DP_HPD
/* Pin renaming */
-#define GPIO_RECOVERY_L GPIO_EC_RECOVERY_BTN_ODL
+#define GPIO_RECOVERY_L GPIO_EC_RECOVERY_BTN_OD
#define GPIO_RECOVERY_L_2 GPIO_H1_EC_RECOVERY_BTN_ODL
#define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL
diff --git a/board/dibbi/gpio.inc b/board/dibbi/gpio.inc
index a79d08d5ee..9358ef782a 100644
--- a/board/dibbi/gpio.inc
+++ b/board/dibbi/gpio.inc
@@ -32,7 +32,7 @@ GPIO_INT(UART1_RX, PIN(B, 0), GPIO_INT_BOTH, uart_deepsleep_interrupt) /* UART_
/* Other interrupts */
GPIO_INT(EC_WP_OD, PIN(A, 6), GPIO_INT_BOTH, switch_interrupt)
/* Directly connected recovery button */
-GPIO_INT(EC_RECOVERY_BTN_ODL, PIN(K, 7), GPIO_INT_BOTH, button_interrupt)
+GPIO_INT(EC_RECOVERY_BTN_OD, PIN(K, 7), GPIO_INT_BOTH, button_interrupt)
/* Recovery button input from H1 */
GPIO_INT(H1_EC_RECOVERY_BTN_ODL,PIN(K, 4), GPIO_INT_BOTH, button_interrupt)
GPIO_INT(BJ_ADP_PRESENT, PIN(A, 7), GPIO_INT_BOTH, adp_connect_interrupt)