diff options
| author | David Huang <david.huang@quanta.corp-partner.google.com> | 2020-08-06 16:28:13 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-08-12 10:50:04 +0000 |
| commit | 57ad328259972d8f2b84375f0ea6c30c2d162a75 (patch) | |
| tree | 26485f85a46cf15366155d136d090e21bac75fac /board/terrador | |
| parent | 4242f8f1dfff6074b29d4a3d07e53cd851befc10 (diff) | |
| download | chrome-ec-57ad328259972d8f2b84375f0ea6c30c2d162a75.tar.gz | |
Terrador: Modify gpio to support proto 2 board
Follow HW change to modify gpio config to support proto 2 board.
BUG=b:151978872
BRANCH=master
TEST=make buildall -j pass.
Signed-off-by: David Huang <david.huang@quanta.corp-partner.google.com>
Change-Id: I9a91c8d7a3f2515fce2a03631786261ce9669c52
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2341196
Reviewed-by: caveh jalali <caveh@chromium.org>
Commit-Queue: caveh jalali <caveh@chromium.org>
Diffstat (limited to 'board/terrador')
| -rw-r--r-- | board/terrador/board.h | 3 | ||||
| -rw-r--r-- | board/terrador/gpio.inc | 15 |
2 files changed, 9 insertions, 9 deletions
diff --git a/board/terrador/board.h b/board/terrador/board.h index 91a0f92b91..051630386d 100644 --- a/board/terrador/board.h +++ b/board/terrador/board.h @@ -109,13 +109,14 @@ #define GPIO_ENTERING_RW GPIO_EC_ENTERING_RW #define GPIO_LID_OPEN GPIO_EC_LID_OPEN #define GPIO_KBD_KSO2 GPIO_EC_KSO_02_INV -#define GPIO_PACKET_MODE_EN GPIO_UART2_EC_RX +#define GPIO_PACKET_MODE_EN GPIO_EC_H1_PACKET_MODE #define GPIO_PCH_WAKE_L GPIO_EC_PCH_WAKE_ODL #define GPIO_PCH_PWRBTN_L GPIO_EC_PCH_PWR_BTN_ODL #define GPIO_PCH_RSMRST_L GPIO_EC_PCH_RSMRST_ODL #define GPIO_PCH_RTCRST GPIO_EC_PCH_RTCRST #define GPIO_PCH_SLP_S0_L GPIO_SLP_S0_L #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L +#define GPIO_PCH_DSW_PWROK GPIO_EC_PCH_DSW_PWROK #define GPIO_PG_EC_DSW_PWROK GPIO_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL #define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL diff --git a/board/terrador/gpio.inc b/board/terrador/gpio.inc index 99741c28b7..91a8ad4a0f 100644 --- a/board/terrador/gpio.inc +++ b/board/terrador/gpio.inc @@ -49,8 +49,7 @@ GPIO_INT(EC_VOLUP_BTN_ODL, PIN(9, 7), GPIO_INT_BOTH | GPIO_PULL_UP, button_inte GPIO(EN_PP3300_A, PIN(A, 3), GPIO_OUT_LOW) GPIO(EN_PP5000_A, PIN(A, 4), GPIO_OUT_LOW) GPIO(EN_PPVAR_VCCIN, PIN(4, 3), GPIO_OUT_LOW) /* Enables VCCIN IMPV9 */ -/* The EC does not buffer this signal on Volteer. */ -UNIMPLEMENTED(PCH_DSW_PWROK) +GPIO(EC_PCH_DSW_PWROK, PIN(C, 0), GPIO_OUT_LOW) /* Other wake sources */ /* @@ -89,6 +88,9 @@ GPIO(USB_C0_RT_RST_ODL, PIN(6, 1), GPIO_ODR_LOW) /* USB_C0 Reset */ GPIO(USB_C1_RT_RST_ODL, PIN(8, 3), GPIO_ODR_LOW) /* USB_C1 Reset */ GPIO(USB_C0_OC_ODL, PIN(B, 1), GPIO_ODR_HIGH) GPIO(USB_C1_OC_ODL, PIN(5, 0), GPIO_ODR_HIGH) +/* There is currently no need to service this interrupt. */ +GPIO(USB_C0_RT_INT_ODL, PIN(B, 7), GPIO_INPUT) +GPIO(USB_C1_RT_INT_ODL, PIN(4, 0), GPIO_INPUT) /* Don't have a load switch for retimer */ UNIMPLEMENTED(USB_C0_LS_EN) @@ -98,9 +100,11 @@ UNIMPLEMENTED(USB_C0_RT_FORCE_PWR) UNIMPLEMENTED(USB_C1_RT_FORCE_PWR) /* Misc Signals */ -GPIO(UART2_EC_RX, PIN(7, 5), GPIO_OUT_LOW) /* H1 Packet Mode */ +GPIO(EC_H1_PACKET_MODE, PIN(7, 5), GPIO_OUT_LOW) /* H1 Packet Mode */ GPIO(EC_KB_BL_EN, PIN(8, 6), GPIO_OUT_LOW) /* Keyboard backlight enable*/ GPIO(CCD_MODE_ODL, PIN(E, 5), GPIO_INPUT) /* Case Closed Debug Mode */ +GPIO(M2_SSD_PLA, PIN(7, 0), GPIO_INPUT) /* SSD power-loss acknowledgment */ +GPIO(M2_SSD_PLN, PIN(A, 0), GPIO_ODR_HIGH) /* SSD power-loss notification */ /* * eDP backlight - both PCH and EC have enable pins that must be high @@ -128,10 +132,6 @@ GPIO(EC_I2C7_EEPROM_SDA, PIN(B, 2), GPIO_INPUT) /* Battery signals */ GPIO(EC_BATT_PRES_ODL, PIN(E, 1), GPIO_INPUT) -/* Physical HPD pins are not needed on EC as these are configured by PMC */ -GPIO(USB_C0_DP_HPD, PIN(B, 7), GPIO_INPUT) -GPIO(USB_C1_DP_HPD, PIN(7, 0), GPIO_INPUT) - /* Alternate functions GPIO definitions */ ALTERNATE(PIN_MASK(B, BIT(5) | BIT(4)), 0, MODULE_I2C, (GPIO_INPUT | GPIO_SEL_1P8V)) /* I2C0 */ ALTERNATE(PIN_MASK(9, BIT(0) | BIT(2) | BIT(1)), 0, MODULE_I2C, 0) /* I2C1 SCL / I2C2 */ @@ -144,7 +144,6 @@ ALTERNATE(PIN_MASK(B, BIT(3) | BIT(2)), 0, MODULE_I2C, 0) /* This selects between an LED module on the motherboard and one on the daughter * board, to be controlled by LED_{1,2,3}_L. PWM allows driving both modules at * the same time. */ -ALTERNATE(PIN_MASK(6, BIT(0)), 0, MODULE_PWM, 0) /* LED_SIDESEL_4_L */ ALTERNATE(PIN_MASK(C, BIT(2) | BIT(3) | BIT(4)), 0, MODULE_PWM, 0) /* LED_{3,2,1}_L */ /* Keyboard pins */ |