diff options
author | Caveh Jalali <caveh@chromium.org> | 2021-04-08 00:40:00 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-04-10 08:33:42 +0000 |
commit | f979f98b8336ad0908f948aa7fe1d57d0a5b54f8 (patch) | |
tree | 5e9b76feda3289dee09bae902ba8d215058ab196 /board | |
parent | f236784d7b721728dfea9ecdf3d0a0592aea8f03 (diff) | |
download | chrome-ec-f979f98b8336ad0908f948aa7fe1d57d0a5b54f8.tar.gz |
brya: Rename GPIOs to match board ID 1
This renames some GPIOs to match the new board revision (ID 1):
LID_OPEN_OD to LID_OPEN
TABLET_MODE_ODL to TABLET_MODE_L
PRB_EC_GPIOC0 to EC_PCH_WAKE_R_ODL
Even though EC_PCH_WAKE_R_ODL looks like a new signal, in both cases,
this pin is not connected to anything. So, there are no functional
changes involved.
BRANCH=none
BUG=b:184811017
TEST=buildall passes
Signed-off-by: Caveh Jalali <caveh@chromium.org>
Change-Id: Ib8eb016f2a209bec8ffb547605c967985a38e232
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2813459
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Diffstat (limited to 'board')
-rw-r--r-- | board/brya/board.h | 3 | ||||
-rw-r--r-- | board/brya/generated-gpio.inc | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/board/brya/board.h b/board/brya/board.h index 149fe8c684..7f91c74551 100644 --- a/board/brya/board.h +++ b/board/brya/board.h @@ -109,14 +109,13 @@ #define GPIO_ENABLE_BACKLIGHT GPIO_EC_EN_EDP_BL #define GPIO_ENTERING_RW GPIO_EC_ENTERING_RW #define GPIO_KBD_KSO2 GPIO_EC_KSO_02_INV -#define GPIO_LID_OPEN GPIO_LID_OPEN_OD #define GPIO_PACKET_MODE_EN GPIO_EC_GSC_PACKET_MODE #define GPIO_PCH_PWRBTN_L GPIO_EC_PCH_PWR_BTN_ODL #define GPIO_PCH_RSMRST_L GPIO_EC_PCH_RSMRST_L #define GPIO_PCH_RTCRST GPIO_EC_PCH_RTCRST #define GPIO_PCH_SLP_S0_L GPIO_SYS_SLP_S0IX_L #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L -#define GMR_TABLET_MODE_GPIO_L GPIO_TABLET_MODE_ODL +#define GMR_TABLET_MODE_GPIO_L GPIO_TABLET_MODE_L /* * GPIO_EC_PCH_INT_ODL is used for MKBP events as well as a PCH wakeup diff --git a/board/brya/generated-gpio.inc b/board/brya/generated-gpio.inc index 4b927b5053..7cad1faf2a 100644 --- a/board/brya/generated-gpio.inc +++ b/board/brya/generated-gpio.inc @@ -18,7 +18,7 @@ GPIO_INT(SEQ_EC_RSMRST_ODL, PIN(E, 2), GPIO_INT_BOTH, power_signal_ GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(SLP_SUS_L, PIN(F, 1), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(SYS_SLP_S0IX_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -GPIO_INT(TABLET_MODE_ODL, PIN(9, 5), GPIO_INT_BOTH, gmr_tablet_switch_isr) +GPIO_INT(TABLET_MODE_L, PIN(9, 5), GPIO_INT_BOTH, gmr_tablet_switch_isr) GPIO_INT(USB_C0_BC12_INT_ODL, PIN(C, 6), GPIO_INT_BOTH, bc12_interrupt) GPIO_INT(USB_C0_C2_TCPC_INT_ODL, PIN(E, 0), GPIO_INT_BOTH, tcpc_alert_event) GPIO_INT(USB_C0_PPC_INT_ODL, PIN(6, 2), GPIO_INT_BOTH, ppc_interrupt) @@ -63,6 +63,7 @@ GPIO(EC_PCH_PWR_BTN_ODL, PIN(C, 1), GPIO_ODR_HIGH) GPIO(EC_PCH_RSMRST_L, PIN(A, 6), GPIO_OUT_LOW) GPIO(EC_PCH_RTCRST, PIN(7, 6), GPIO_OUT_LOW) GPIO(EC_PCH_SYS_PWROK, PIN(3, 7), GPIO_OUT_LOW) +GPIO(EC_PCH_WAKE_R_ODL, PIN(C, 0), GPIO_INPUT | GPIO_PULL_UP) GPIO(EC_PROCHOT_ODL, PIN(6, 3), GPIO_ODR_HIGH) GPIO(EC_RST_ODL, PIN(7, 7), GPIO_INPUT | GPIO_PULL_UP) GPIO(EN_PP5000_FAN, PIN(6, 1), GPIO_OUT_HIGH) @@ -70,9 +71,8 @@ GPIO(EN_PP5000_USBA_R, PIN(D, 7), GPIO_OUT_LOW) GPIO(EN_S5_RAILS, PIN(B, 6), GPIO_OUT_LOW) GPIO(EN_SLP_Z, PIN(A, 3), GPIO_OUT_LOW) GPIO(IMVP9_VRRDY_OD, PIN(4, 3), GPIO_INPUT) -GPIO(LID_OPEN_OD, PIN(D, 2), GPIO_INPUT) +GPIO(LID_OPEN, PIN(D, 2), GPIO_INPUT) GPIO(PCH_PWROK, PIN(7, 2), GPIO_OUT_LOW) -GPIO(PRB_EC_GPIOC0, PIN(C, 0), GPIO_INPUT | GPIO_PULL_UP) GPIO(SYS_RST_ODL, PIN(C, 5), GPIO_ODR_HIGH) GPIO(USB_C0_C2_TCPC_RST_ODL, PIN(3, 4), GPIO_ODR_LOW) GPIO(USB_C1_FRS_EN, PIN(9, 4), GPIO_OUT_LOW) |