diff options
| author | Abe Levkoy <alevkoy@chromium.org> | 2020-06-30 16:06:10 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-07-01 20:15:48 +0000 |
| commit | 17b4dc6abc25351f83b6aa8a4a189eda986d2bcc (patch) | |
| tree | b8e05e13ad9c100be7f752a000325b09b29b38c8 | |
| parent | cb38a889caec1ff6c40bcf244b67f75c9a3b58b2 (diff) | |
| download | chrome-ec-17b4dc6abc25351f83b6aa8a4a189eda986d2bcc.tar.gz | |
volteer: Update GPIO names
Make them consistent with new boards.
BUG=b:157609784
TEST=make buildall
BRANCH=none
Signed-off-by: Abe Levkoy <alevkoy@chromium.org>
Change-Id: Ied2c768fa8fe63604597ff508c73cfe685cfe1d3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2276582
Reviewed-by: Keith Short <keithshort@chromium.org>
| -rw-r--r-- | board/volteer/board.c | 8 | ||||
| -rw-r--r-- | board/volteer/board.h | 2 | ||||
| -rw-r--r-- | board/volteer/gpio.inc | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/board/volteer/board.c b/board/volteer/board.c index 6eb1ae988f..77685650a5 100644 --- a/board/volteer/board.c +++ b/board/volteer/board.c @@ -179,15 +179,15 @@ const struct i2c_port_t i2c_ports[] = { .name = "power", .port = I2C_PORT_POWER, .kbps = 100, - .scl = GPIO_EC_I2C5_POWER_SCL, - .sda = GPIO_EC_I2C5_POWER_SDA, + .scl = GPIO_EC_I2C5_BATTERY_SCL, + .sda = GPIO_EC_I2C5_BATTERY_SDA, }, { .name = "eeprom", .port = I2C_PORT_EEPROM, .kbps = 400, - .scl = GPIO_EC_I2C7_EEPROM_SCL, - .sda = GPIO_EC_I2C7_EEPROM_SDA, + .scl = GPIO_EC_I2C7_EEPROM_PWR_SCL_R, + .sda = GPIO_EC_I2C7_EEPROM_PWR_SDA_R, }, }; const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); diff --git a/board/volteer/board.h b/board/volteer/board.h index bd10037cf6..5df2ce1a26 100644 --- a/board/volteer/board.h +++ b/board/volteer/board.h @@ -105,7 +105,7 @@ #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 diff --git a/board/volteer/gpio.inc b/board/volteer/gpio.inc index 3f9e801d31..5e7406ae81 100644 --- a/board/volteer/gpio.inc +++ b/board/volteer/gpio.inc @@ -104,7 +104,7 @@ UNIMPLEMENTED(USB_C1_LS_EN) 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 */ /* * TODO(b/138954381): Determine the polarity of these SSD signals and whether * they are open-drain. @@ -136,10 +136,10 @@ GPIO(EC_I2C2_USB_C1_SCL, PIN(9, 2), GPIO_INPUT) GPIO(EC_I2C2_USB_C1_SDA, PIN(9, 1), GPIO_INPUT) GPIO(EC_I2C3_USB_1_MIX_SCL, PIN(D, 1), GPIO_INPUT) GPIO(EC_I2C3_USB_1_MIX_SDA, PIN(D, 0), GPIO_INPUT) -GPIO(EC_I2C5_POWER_SCL, PIN(3, 3), GPIO_INPUT) -GPIO(EC_I2C5_POWER_SDA, PIN(3, 6), GPIO_INPUT) -GPIO(EC_I2C7_EEPROM_SCL, PIN(B, 3), GPIO_INPUT) -GPIO(EC_I2C7_EEPROM_SDA, PIN(B, 2), GPIO_INPUT) +GPIO(EC_I2C5_BATTERY_SCL, PIN(3, 3), GPIO_INPUT) +GPIO(EC_I2C5_BATTERY_SDA, PIN(3, 6), GPIO_INPUT) +GPIO(EC_I2C7_EEPROM_PWR_SCL_R, PIN(B, 3), GPIO_INPUT) +GPIO(EC_I2C7_EEPROM_PWR_SDA_R, PIN(B, 2), GPIO_INPUT) /* Battery signals */ GPIO(EC_BATT_PRES_ODL, PIN(E, 1), GPIO_INPUT) |