From 4f3d3d6ae6e3ba26767c0a644cfd8618684e2c72 Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Fri, 14 Apr 2023 13:42:36 -0700 Subject: Hades: Rename USB-C2 USB-C1 This CL renames USB-C2 USB-C1 to reflect the schematics names. There is no functionality change. BUG=b:272821227 BRANCH=None TEST=make BOARD=Hades Signed-off-by: Daisuke Nojiri Change-Id: Ibaba57dd6d9570ad9f0b5a14ed4dc5cdddb8d3af Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4455300 Reviewed-by: Tarun Tuli --- board/hades/board.h | 6 +++--- board/hades/gpio.inc | 12 ++++++------ board/hades/i2c.c | 8 ++++---- board/hades/usbc_config.c | 44 ++++++++++++++++++++++---------------------- board/hades/usbc_config.h | 2 +- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/board/hades/board.h b/board/hades/board.h index cb6463c86d..14cd16bf2e 100644 --- a/board/hades/board.h +++ b/board/hades/board.h @@ -109,13 +109,13 @@ #define I2C_PORT_SENSOR NPCX_I2C_PORT0_0 #define I2C_PORT_USB_C0_TCPC NPCX_I2C_PORT1_0 -#define I2C_PORT_USB_C2_TCPC NPCX_I2C_PORT2_0 +#define I2C_PORT_USB_C1_TCPC NPCX_I2C_PORT2_0 #define I2C_PORT_USB_C0_PPC NPCX_I2C_PORT1_0 -#define I2C_PORT_USB_C2_PPC NPCX_I2C_PORT2_0 +#define I2C_PORT_USB_C1_PPC NPCX_I2C_PORT2_0 #define I2C_PORT_USB_C0_BC12 NPCX_I2C_PORT1_0 -#define I2C_PORT_USB_C2_BC12 NPCX_I2C_PORT2_0 +#define I2C_PORT_USB_C1_BC12 NPCX_I2C_PORT2_0 #define I2C_PORT_USBA1_RT NPCX_I2C_PORT6_1 diff --git a/board/hades/gpio.inc b/board/hades/gpio.inc index a3d2865d18..1140ef5671 100644 --- a/board/hades/gpio.inc +++ b/board/hades/gpio.inc @@ -23,9 +23,9 @@ GPIO_INT(USB_C0_BC12_INT_ODL, PIN(C, 6), GPIO_INT_FALLING, bc12_inter GPIO_INT(USB_C0_TCPC_INT_ODL, PIN(E, 0), GPIO_INT_FALLING, tcpc_alert_event) GPIO_INT(USB_C0_PPC_INT_ODL, PIN(6, 2), GPIO_INT_FALLING, ppc_interrupt) GPIO_INT(PG_PP3300_S5_OD, PIN(B, 4), GPIO_INT_BOTH | GPIO_PULL_UP, board_power_interrupt) -GPIO_INT(USB_C2_BC12_INT_ODL, PIN(8, 3), GPIO_INT_FALLING, bc12_interrupt) -GPIO_INT(USB_C2_TCPC_INT_ODL, PIN(A, 7), GPIO_INT_FALLING, tcpc_alert_event) -GPIO_INT(USB_C2_PPC_INT_ODL, PIN(7, 0), GPIO_INT_FALLING, ppc_interrupt) +GPIO_INT(USB_C1_BC12_INT_ODL, PIN(8, 3), GPIO_INT_FALLING, bc12_interrupt) +GPIO_INT(USB_C1_TCPC_INT_ODL, PIN(A, 7), GPIO_INT_FALLING, tcpc_alert_event) +GPIO_INT(USB_C1_PPC_INT_ODL, PIN(7, 0), GPIO_INT_FALLING, ppc_interrupt) GPIO_INT(BJ_ADP_PRESENT_ODL, PIN(9, 5), GPIO_INT_BOTH | GPIO_PULL_UP, bj_present_interrupt) GPIO_INT(GPU_OVERT_ODL, PIN(5, 0), GPIO_INT_BOTH, gpu_overt_interrupt) @@ -40,8 +40,8 @@ GPIO(EC_I2C_BAT_SCL, PIN(3, 3), GPIO_INPUT) GPIO(EC_I2C_BAT_SDA, PIN(3, 6), GPIO_INPUT) GPIO(EC_I2C_MISC_SCL_R, PIN(B, 3), GPIO_INPUT) GPIO(EC_I2C_MISC_SDA_R, PIN(B, 2), GPIO_INPUT) -GPIO(EC_I2C_USB_C2_SCL, PIN(9, 2), GPIO_INPUT) -GPIO(EC_I2C_USB_C2_SDA, PIN(9, 1), GPIO_INPUT) +GPIO(EC_I2C_USB_C1_SCL, PIN(9, 2), GPIO_INPUT) +GPIO(EC_I2C_USB_C1_SDA, PIN(9, 1), GPIO_INPUT) GPIO(EC_I2C_USB_C0_SCL, PIN(9, 0), GPIO_INPUT) GPIO(EC_I2C_USB_C0_SDA, PIN(8, 7), GPIO_INPUT) GPIO(EC_I2C_USBA_RT_SCL, PIN(E, 4), GPIO_INPUT) @@ -67,7 +67,7 @@ GPIO(EC_USB_PCH_C2_OC_ODL, PIN(9, 7), GPIO_ODR_HIGH) GPIO(VCCST_PWRGD_OD, PIN(A, 4), GPIO_ODR_LOW) GPIO(EN_USB_A_LOW_POWER, PIN(9, 3), GPIO_OUT_LOW) GPIO(PG_PP3300_S5_EC_SEQ_OD, PIN(B, 5), GPIO_OUT_LOW) -GPIO(USB_C2_FRS_EN, PIN(D, 4), GPIO_OUT_LOW) +GPIO(USB_C1_FRS_EN, PIN(D, 4), GPIO_OUT_LOW) GPIO(NVIDIA_GPU_ACOFF_ODL, PIN(5, 6), GPIO_ODR_HIGH) GPIO(LED_2_L, PIN(C, 3), GPIO_OUT_LOW) GPIO(LED_1_L, PIN(C, 4), GPIO_OUT_LOW) diff --git a/board/hades/i2c.c b/board/hades/i2c.c index bf8c88b211..6bdbfda2f2 100644 --- a/board/hades/i2c.c +++ b/board/hades/i2c.c @@ -22,11 +22,11 @@ const struct i2c_port_t i2c_ports[] = { }, { /* I2C2 */ - .name = "tcpc2", - .port = I2C_PORT_USB_C2_TCPC, + .name = "tcpc1", + .port = I2C_PORT_USB_C1_TCPC, .kbps = 400, - .scl = GPIO_EC_I2C_USB_C2_SCL, - .sda = GPIO_EC_I2C_USB_C2_SDA, + .scl = GPIO_EC_I2C_USB_C1_SCL, + .sda = GPIO_EC_I2C_USB_C1_SDA, }, { /* I2C5 */ diff --git a/board/hades/usbc_config.c b/board/hades/usbc_config.c index fa3ab5bb52..7448204aa2 100644 --- a/board/hades/usbc_config.c +++ b/board/hades/usbc_config.c @@ -46,10 +46,10 @@ const struct tcpc_config_t tcpc_config[] = { }, .drv = &rt1715_tcpm_drv, }, - [USBC_PORT_C2] = { + [USBC_PORT_C1] = { .bus_type = EC_BUS_TYPE_I2C, .i2c_info = { - .port = I2C_PORT_USB_C2_TCPC, + .port = I2C_PORT_USB_C1_TCPC, .addr_flags = RT1715_I2C_ADDR_FLAGS, }, .drv = &rt1715_tcpm_drv, @@ -75,11 +75,11 @@ struct ppc_config_t ppc_chips[] = { .i2c_addr_flags = SYV682X_ADDR0_FLAGS, .drv = &syv682x_drv, }, - [USBC_PORT_C2] = { - .i2c_port = I2C_PORT_USB_C2_PPC, + [USBC_PORT_C1] = { + .i2c_port = I2C_PORT_USB_C1_PPC, .i2c_addr_flags = SYV682X_ADDR2_FLAGS, - .frs_en = GPIO_USB_C2_FRS_EN, .drv = &syv682x_drv, + .frs_en = GPIO_USB_C1_FRS_EN, }, }; @@ -146,8 +146,8 @@ int board_ps8818_mux_set(const struct usb_mux *me, mux_state_t mux_state) const static struct usb_mux_chain usbc2_ps8818 = { .mux = &(const struct usb_mux){ - .usb_port = USBC_PORT_C2, - .i2c_port = I2C_PORT_USB_C2_TCPC, + .usb_port = USBC_PORT_C1, + .i2c_port = I2C_PORT_USB_C1_TCPC, .i2c_addr_flags = PS8818_I2C_ADDR0_FLAGS, .driver = &ps8818_usb_retimer_driver, .board_set = &board_ps8818_mux_set, @@ -163,9 +163,9 @@ const struct usb_mux_chain usb_muxes[] = { .hpd_update = &virtual_hpd_update, }, }, - [USBC_PORT_C2] = { + [USBC_PORT_C1] = { .mux = &(const struct usb_mux) { - .usb_port = USBC_PORT_C2, + .usb_port = USBC_PORT_C1, .driver = &virtual_usb_mux_driver, .hpd_update = &virtual_hpd_update, }, @@ -180,8 +180,8 @@ const struct pi3usb9201_config_t pi3usb9201_bc12_chips[] = { .i2c_port = I2C_PORT_USB_C0_BC12, .i2c_addr_flags = PI3USB9201_I2C_ADDR_3_FLAGS, }, - [USBC_PORT_C2] = { - .i2c_port = I2C_PORT_USB_C2_BC12, + [USBC_PORT_C1] = { + .i2c_port = I2C_PORT_USB_C1_BC12, .i2c_addr_flags = PI3USB9201_I2C_ADDR_3_FLAGS, }, }; @@ -230,15 +230,15 @@ static void board_tcpc_init(void) /* Enable PPC interrupts. */ gpio_enable_interrupt(GPIO_USB_C0_PPC_INT_ODL); - gpio_enable_interrupt(GPIO_USB_C2_PPC_INT_ODL); + gpio_enable_interrupt(GPIO_USB_C1_PPC_INT_ODL); /* Enable TCPC interrupts. */ gpio_enable_interrupt(GPIO_USB_C0_TCPC_INT_ODL); - gpio_enable_interrupt(GPIO_USB_C2_TCPC_INT_ODL); + gpio_enable_interrupt(GPIO_USB_C1_TCPC_INT_ODL); /* Enable BC1.2 interrupts. */ gpio_enable_interrupt(GPIO_USB_C0_BC12_INT_ODL); - gpio_enable_interrupt(GPIO_USB_C2_BC12_INT_ODL); + gpio_enable_interrupt(GPIO_USB_C1_BC12_INT_ODL); } DECLARE_HOOK(HOOK_INIT, board_tcpc_init, HOOK_PRIO_INIT_CHIPSET); @@ -249,7 +249,7 @@ uint16_t tcpc_get_alert_status(void) if (gpio_get_level(GPIO_USB_C0_TCPC_INT_ODL) == 0) status |= PD_STATUS_TCPC_ALERT_0; - if (gpio_get_level(GPIO_USB_C2_TCPC_INT_ODL) == 0) + if (gpio_get_level(GPIO_USB_C1_TCPC_INT_ODL) == 0) status |= PD_STATUS_TCPC_ALERT_1; return status; @@ -260,8 +260,8 @@ int ppc_get_alert_status(int port) if (port == USBC_PORT_C0) return gpio_get_level(GPIO_USB_C0_PPC_INT_ODL) == 0; - if (port == USBC_PORT_C2) - return gpio_get_level(GPIO_USB_C2_PPC_INT_ODL) == 0; + if (port == USBC_PORT_C1) + return gpio_get_level(GPIO_USB_C1_PPC_INT_ODL) == 0; return 0; } @@ -272,8 +272,8 @@ void tcpc_alert_event(enum gpio_signal signal) case GPIO_USB_C0_TCPC_INT_ODL: schedule_deferred_pd_interrupt(USBC_PORT_C0); break; - case GPIO_USB_C2_TCPC_INT_ODL: - schedule_deferred_pd_interrupt(USBC_PORT_C2); + case GPIO_USB_C1_TCPC_INT_ODL: + schedule_deferred_pd_interrupt(USBC_PORT_C1); break; default: break; @@ -286,7 +286,7 @@ void bc12_interrupt(enum gpio_signal signal) case GPIO_USB_C0_BC12_INT_ODL: usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; - case GPIO_USB_C2_BC12_INT_ODL: + case GPIO_USB_C1_BC12_INT_ODL: usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: @@ -300,8 +300,8 @@ void ppc_interrupt(enum gpio_signal signal) case GPIO_USB_C0_PPC_INT_ODL: syv682x_interrupt(USBC_PORT_C0); break; - case GPIO_USB_C2_PPC_INT_ODL: - syv682x_interrupt(USBC_PORT_C2); + case GPIO_USB_C1_PPC_INT_ODL: + syv682x_interrupt(USBC_PORT_C1); break; default: break; diff --git a/board/hades/usbc_config.h b/board/hades/usbc_config.h index 831dcc1a9f..fa3c5d241b 100644 --- a/board/hades/usbc_config.h +++ b/board/hades/usbc_config.h @@ -10,7 +10,7 @@ #define CONFIG_USB_PD_PORT_MAX_COUNT 2 -enum usbc_port { USBC_PORT_C0 = 0, USBC_PORT_C2, USBC_PORT_COUNT }; +enum usbc_port { USBC_PORT_C0 = 0, USBC_PORT_C1, USBC_PORT_COUNT }; struct ps8818_reg_val { uint8_t reg; -- cgit v1.2.1