diff options
author | Michael5 Chen1 <michael5_chen1@pegatron.corp-partner.google.com> | 2022-11-30 16:00:36 +0800 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-12-19 01:52:53 +0000 |
commit | eab7e3d1c9c89667fda5cc7f198542cdc7a3d1da (patch) | |
tree | 646359cf71325cf1a130469bb93eebcf3daafc02 | |
parent | a6fdc7885a8465065e5c8bd6316181026045bb6c (diff) | |
download | chrome-ec-eab7e3d1c9c89667fda5cc7f198542cdc7a3d1da.tar.gz |
marasov: Remove TBT function
Not support TBT, remove TBT function
BUG=b:259002141
BRANCH=none
TEST=make BOARD=marasov
1. Check EC console log.
Change-Id: I2cc8c994e37f81473b43bf68576aed1fa325bcd3
Signed-off-by: Michael5 Chen1 <michael5_chen1@pegatron.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4059937
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Reviewed-by: Kyle Lin <kylelinck@google.com>
-rw-r--r-- | board/marasov/board.h | 22 | ||||
-rw-r--r-- | board/marasov/generated-gpio.inc | 7 | ||||
-rw-r--r-- | board/marasov/i2c.c | 8 | ||||
-rw-r--r-- | board/marasov/usbc_config.c | 31 |
4 files changed, 5 insertions, 63 deletions
diff --git a/board/marasov/board.h b/board/marasov/board.h index 168bf795ca..f386087d65 100644 --- a/board/marasov/board.h +++ b/board/marasov/board.h @@ -34,9 +34,6 @@ #define USB_PORT_COUNT 2 #define CONFIG_USB_PORT_POWER_DUMB -/* USB Type C and USB PD defines */ -#define CONFIG_USB_PD_REQUIRE_AP_MODE_ENTRY - #define CONFIG_IO_EXPANDER #define CONFIG_IO_EXPANDER_NCT38XX #define CONFIG_IO_EXPANDER_PORT_COUNT 1 @@ -45,7 +42,6 @@ #define CONFIG_USB_PD_TCPM_PS8815 #define CONFIG_USB_PD_TCPM_PS8815_FORCE_DID -#define CONFIG_USBC_RETIMER_INTEL_BB #undef CONFIG_BC12_DETECT_PI3USB9201 #undef CONFIG_USB_CHARGER @@ -122,9 +118,6 @@ #define I2C_PORT_USB_C0_PPC NPCX_I2C_PORT2_0 #define I2C_PORT_USB_C1_PPC NPCX_I2C_PORT6_1 -#define I2C_PORT_USB_C0_MUX NPCX_I2C_PORT3_0 -#define I2C_PORT_USB_C1_MUX NPCX_I2C_PORT6_1 - #define I2C_PORT_BATTERY NPCX_I2C_PORT5_0 #define I2C_PORT_CHARGER NPCX_I2C_PORT7_0 #define I2C_PORT_EEPROM NPCX_I2C_PORT7_0 @@ -134,21 +127,6 @@ #define I2C_ADDR_MP2964_FLAGS 0x20 -/* - * see b/174768555#comment22 - */ -#define USBC_PORT_C0_BB_RETIMER_I2C_ADDR 0x56 - -/* Enabling Thunderbolt-compatible mode */ -#define CONFIG_USB_PD_TBT_COMPAT_MODE - -/* Enabling USB4 mode */ -#define CONFIG_USB_PD_USB4 -#define CONFIG_USB_PD_DATA_RESET_MSG - -/* Retimer */ -#define CONFIG_USBC_RETIMER_FW_UPDATE - /* Thermal features */ #define CONFIG_THERMISTOR #define CONFIG_TEMP_SENSOR diff --git a/board/marasov/generated-gpio.inc b/board/marasov/generated-gpio.inc index f01f5b790b..59a360193e 100644 --- a/board/marasov/generated-gpio.inc +++ b/board/marasov/generated-gpio.inc @@ -16,7 +16,6 @@ GPIO_INT(SLP_SUS_L, PIN(F, 1), GPIO_INT_BOTH, power_signal_ GPIO_INT(SYS_SLP_S0IX_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) 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(USB_C0_RT_INT_ODL, PIN(B, 1), GPIO_INT_FALLING, retimer_interrupt) GPIO_INT(USB_C1_PPC_INT_ODL, PIN(F, 5), GPIO_INT_FALLING, ppc_interrupt) GPIO_INT(USB_C1_TCPC_INT_ODL, PIN(A, 2), GPIO_INT_FALLING, tcpc_alert_event) @@ -36,8 +35,6 @@ GPIO(EC_I2C_SENSOR_SCL, PIN(B, 5), GPIO_INPUT | GPIO_SEL_1P8V) GPIO(EC_I2C_SENSOR_SDA, PIN(B, 4), GPIO_INPUT | GPIO_SEL_1P8V) GPIO(EC_I2C_USB_C0_PPC_BC_SCL, PIN(9, 2), GPIO_INPUT) GPIO(EC_I2C_USB_C0_PPC_BC_SDA, PIN(9, 1), GPIO_INPUT) -GPIO(EC_I2C_USB_C0_RT_SCL, PIN(D, 1), GPIO_INPUT) -GPIO(EC_I2C_USB_C0_RT_SDA, PIN(D, 0), GPIO_INPUT) GPIO(EC_I2C_USB_C0_TCPC_SCL, PIN(9, 0), GPIO_INPUT) GPIO(EC_I2C_USB_C0_TCPC_SDA, PIN(8, 7), GPIO_INPUT) GPIO(EC_I2C_USB_C1_MIX_SCL, PIN(E, 4), GPIO_INPUT) @@ -77,7 +74,6 @@ ALTERNATE(PIN_MASK(8, 0x80), 0, MODULE_I2C, 0) /* GPIO87/I2C1_SDA0 ALTERNATE(PIN_MASK(9, 0x07), 0, MODULE_I2C, 0) /* GPIO92/I2C2_SCL0, GPIO91/I2C2_SDA0, GPIO90/I2C1_SCL0 */ ALTERNATE(PIN_MASK(B, 0x0c), 0, MODULE_I2C, 0) /* GPIOB3/I2C7_SCL0/DCD_L, GPIOB2/I2C7_SDA0/DSR_L */ ALTERNATE(PIN_MASK(B, 0x30), 0, MODULE_I2C, GPIO_SEL_1P8V) /* GPIOB5/I2C0_SCL0, GPIOB4/I2C0_SDA0 */ -ALTERNATE(PIN_MASK(D, 0x03), 0, MODULE_I2C, 0) /* GPIOD1/I2C3_SCL0, GPIOD0/I2C3_SDA0 */ ALTERNATE(PIN_MASK(E, 0x18), 0, MODULE_I2C, 0) /* GPIOE4/I2C6_SCL1/I3C_SCL, GPIOE3/I2C6_SDA1/I3C_SDA */ ALTERNATE(PIN_MASK(F, 0x0c), 0, MODULE_I2C, 0) /* GPIOF3/I2C4_SCL1, GPIOF2/I2C4_SDA1 */ @@ -123,5 +119,8 @@ UNUSED(PIN(5, 0)) /* GPIO50 */ UNUSED(PIN(8, 3)) /* GPIO83 */ UNUSED(PIN(7, 0)) /* GPIO70 */ UNUSED(PIN(4, 1)) /* GPIO41 */ +UNUSED(PIN(B, 1)) /* GPIOB1 */ +UNUSED(PIN(D, 0)) /* GPIOD0 */ +UNUSED(PIN(D, 1)) /* GPIOD1 */ /* Pre-configured PSL balls: J8 K6 */ diff --git a/board/marasov/i2c.c b/board/marasov/i2c.c index 15c9b13e83..792dc1745a 100644 --- a/board/marasov/i2c.c +++ b/board/marasov/i2c.c @@ -36,14 +36,6 @@ const struct i2c_port_t i2c_ports[] = { .sda = GPIO_EC_I2C_USB_C0_PPC_BC_SDA, }, { - /* I2C3 */ - .name = "retimer0,2", - .port = I2C_PORT_USB_C0_MUX, - .kbps = 1000, - .scl = GPIO_EC_I2C_USB_C0_RT_SCL, - .sda = GPIO_EC_I2C_USB_C0_RT_SDA, - }, - { /* I2C4 C1 TCPC */ .name = "tcpc1", .port = I2C_PORT_USB_C1_TCPC, diff --git a/board/marasov/usbc_config.c b/board/marasov/usbc_config.c index d0acbb33c2..f84506c796 100644 --- a/board/marasov/usbc_config.c +++ b/board/marasov/usbc_config.c @@ -9,7 +9,6 @@ #include "compile_time_macros.h" #include "console.h" #include "driver/ppc/syv682x_public.h" -#include "driver/retimer/bb_retimer_public.h" #include "driver/tcpm/nct38xx.h" #include "driver/tcpm/ps8xxx_public.h" #include "driver/tcpm/tcpci.h" @@ -129,11 +128,8 @@ const struct usb_mux_chain usb_muxes[] = { [USBC_PORT_C0] = { .mux = &(const struct usb_mux) { .usb_port = USBC_PORT_C0, - .flags = USB_MUX_FLAG_CAN_IDLE, - .driver = &bb_usb_retimer, - .hpd_update = bb_retimer_hpd_update, - .i2c_port = I2C_PORT_USB_C0_MUX, - .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, + .driver = &virtual_usb_mux_driver, + .hpd_update = &virtual_hpd_update, }, .next = &usbc0_tcss_usb_mux, }, @@ -319,30 +315,7 @@ void ppc_interrupt(enum gpio_signal signal) } } -void retimer_interrupt(enum gpio_signal signal) -{ - /* - * TODO(b/179513527): add USB-C support - */ -} - __override bool board_is_dts_port(int port) { return port == USBC_PORT_C0; } - -__override bool board_is_tbt_usb4_port(int port) -{ - if (port == USBC_PORT_C0) - return true; - - return false; -} - -__override enum tbt_compat_cable_speed board_get_max_tbt_speed(int port) -{ - if (!board_is_tbt_usb4_port(port)) - return TBT_SS_RES_0; - - return TBT_SS_TBT_GEN3; -} |