diff options
| author | Ben Chen <ben.chen2@quanta.corp-partner.google.com> | 2020-09-02 14:53:33 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-09-03 04:47:09 +0000 |
| commit | 822f536d5b51934345061020699d15436737dd7f (patch) | |
| tree | 0c42afb0bec99cd7c8e507bac9fa8d3452142378 /board/voxel | |
| parent | 0ebea59ecfb70b30a6dfb8232489be681500e084 (diff) | |
| download | chrome-ec-822f536d5b51934345061020699d15436737dd7f.tar.gz | |
voxel: modify mb gpio pin define
config mb gpio pin define.
BUG=b:160363945
BRANCH=master
TEST=make buildall PASS.
Change-Id: Iee9295b09d4629be3fbbe7852db43d1b607f1086
Signed-off-by: Ben Chen <ben.chen2@quanta.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2388364
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
Diffstat (limited to 'board/voxel')
| -rw-r--r-- | board/voxel/board.h | 4 | ||||
| -rw-r--r-- | board/voxel/gpio.inc | 16 |
2 files changed, 9 insertions, 11 deletions
diff --git a/board/voxel/board.h b/board/voxel/board.h index 5adc22c118..357cad327e 100644 --- a/board/voxel/board.h +++ b/board/voxel/board.h @@ -117,14 +117,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_PG_EC_DSW_PWROK GPIO_DSW_PWROK +#define GPIO_PCH_DSW_PWROK GPIO_EC_PCH_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL #define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL diff --git a/board/voxel/gpio.inc b/board/voxel/gpio.inc index fafa5f5a47..3d8c61dceb 100644 --- a/board/voxel/gpio.inc +++ b/board/voxel/gpio.inc @@ -21,7 +21,7 @@ GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(SLP_SUS_L, PIN(D, 7), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PG_EC_RSMRST_ODL, PIN(E, 2), GPIO_INT_BOTH, power_signal_interrupt) -GPIO_INT(DSW_PWROK, PIN(C, 7), GPIO_INT_BOTH, power_signal_interrupt) +GPIO_INT(PG_EC_DSW_PWROK, PIN(C, 7), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PG_EC_ALL_SYS_PWRGD, PIN(F, 4), GPIO_INT_BOTH, power_signal_interrupt) /* Sensor Interrupts */ @@ -54,8 +54,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 */ /* @@ -99,25 +98,28 @@ GPIO(USB_C0_OC_ODL, PIN(B, 1), GPIO_ODR_HIGH) GPIO(USB_C1_OC_ODL, PIN(5, 0), GPIO_ODR_HIGH) GPIO(USB_C0_RT_INT_ODL, PIN(C, 6), GPIO_INPUT) GPIO(USB_C1_RT_INT_ODL, PIN(9, 6), GPIO_INPUT) +GPIO(USB_C0_FRS_EN, PIN(C, 2), GPIO_OUT_LOW) +GPIO(USB_C1_FRS_EN, PIN(9, 4), GPIO_OUT_LOW) /* Don't have a load switch for retimer */ UNIMPLEMENTED(USB_C0_LS_EN) UNIMPLEMENTED(USB_C1_LS_EN) /* 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(LED_1_L, PIN(C, 4), GPIO_OUT_HIGH) /* Blue */ GPIO(LED_2_L, PIN(C, 3), GPIO_OUT_HIGH) /* Yellow */ GPIO(EC_KB_BL_EN, PIN(8, 6), GPIO_OUT_LOW) /* Keyboard backlight enable*/ GPIO(M2_SSD_PLN, PIN(A, 0), GPIO_ODR_HIGH) /* SSD power-loss notification */ +GPIO(M2_SSD_PLA, PIN(7, 0), GPIO_INPUT) /* SSD power-loss acknowledgment */ GPIO(CCD_MODE_ODL, PIN(E, 5), GPIO_INPUT) /* Case Closed Debug Mode */ GPIO(EC_SLP_S0IX, PIN(7, 2), GPIO_INPUT | GPIO_PULL_UP) /* Unused signals */ GPIO(UNUSED_GPIO34, PIN(3, 4), GPIO_INPUT | GPIO_PULL_UP) +GPIO(UNUSED_GPIO60, PIN(6, 0), GPIO_INPUT | GPIO_PULL_UP) GPIO(UNUSED_GPIOA7, PIN(A, 7), GPIO_INPUT | GPIO_PULL_UP) -GPIO(UNUSED_GPIOC0, PIN(C, 0), GPIO_INPUT | GPIO_PULL_UP) /* * eDP backlight - both PCH and EC have enable pins that must be high @@ -145,10 +147,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(6, 0), 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 */ |