diff options
36 files changed, 0 insertions, 258 deletions
diff --git a/baseboard/intelrvp/baseboard.h b/baseboard/intelrvp/baseboard.h index 4b1d96c755..48ababd771 100644 --- a/baseboard/intelrvp/baseboard.h +++ b/baseboard/intelrvp/baseboard.h @@ -102,7 +102,6 @@ /* USB MUX */ #ifdef CONFIG_USB_MUX_VIRTUAL #define CONFIG_HOSTCMD_LOCATE_CHIP - #define CONFIG_INTEL_VIRTUAL_MUX #endif #define CONFIG_USBC_SS_MUX diff --git a/baseboard/volteer/baseboard.h b/baseboard/volteer/baseboard.h index d63c0062d5..8dc48f4c8c 100644 --- a/baseboard/volteer/baseboard.h +++ b/baseboard/volteer/baseboard.h @@ -206,7 +206,6 @@ */ #define CONFIG_USBC_PPC_DEDICATED_INT -#define CONFIG_INTEL_VIRTUAL_MUX #define CONFIG_USBC_SS_MUX #define CONFIG_USB_MUX_VIRTUAL diff --git a/board/adlrvpp_ite/board.c b/board/adlrvpp_ite/board.c index d5aba06089..ac3a501a67 100644 --- a/board/adlrvpp_ite/board.c +++ b/board/adlrvpp_ite/board.c @@ -138,9 +138,6 @@ const struct tcpc_config_t tcpc_config[] = { .bus_type = EC_BUS_TYPE_EMBEDDED, /* TCPC is embedded within EC so no i2c config needed */ .drv = &it83xx_tcpm_drv, -#ifdef CONFIG_INTEL_VIRTUAL_MUX - .usb23 = TYPE_C_PORT_0_USB2_NUM | (TYPE_C_PORT_0_USB3_NUM << 4), -#endif }, [TYPE_C_PORT_1] = { .bus_type = EC_BUS_TYPE_I2C, @@ -149,9 +146,6 @@ const struct tcpc_config_t tcpc_config[] = { .addr_flags = I2C_ADDR_FUSB302_TCPC_AIC, }, .drv = &fusb302_tcpm_drv, -#ifdef CONFIG_INTEL_VIRTUAL_MUX - .usb23 = TYPE_C_PORT_1_USB2_NUM | (TYPE_C_PORT_1_USB3_NUM << 4), -#endif }, [TYPE_C_PORT_2] = { .bus_type = EC_BUS_TYPE_I2C, @@ -160,9 +154,6 @@ const struct tcpc_config_t tcpc_config[] = { .addr_flags = I2C_ADDR_FUSB302_TCPC_AIC, }, .drv = &fusb302_tcpm_drv, -#ifdef CONFIG_INTEL_VIRTUAL_MUX - .usb23 = TYPE_C_PORT_2_USB2_NUM | (TYPE_C_PORT_2_USB3_NUM << 4), -#endif }, [TYPE_C_PORT_3] = { .bus_type = EC_BUS_TYPE_I2C, @@ -171,9 +162,6 @@ const struct tcpc_config_t tcpc_config[] = { .addr_flags = I2C_ADDR_FUSB302_TCPC_AIC, }, .drv = &fusb302_tcpm_drv, -#ifdef CONFIG_INTEL_VIRTUAL_MUX - .usb23 = TYPE_C_PORT_3_USB2_NUM | (TYPE_C_PORT_3_USB3_NUM << 4), -#endif }, }; BUILD_ASSERT(ARRAY_SIZE(tcpc_config) == CONFIG_USB_PD_PORT_MAX_COUNT); diff --git a/board/adlrvpp_ite/board.h b/board/adlrvpp_ite/board.h index 674b45aa69..393268138c 100644 --- a/board/adlrvpp_ite/board.h +++ b/board/adlrvpp_ite/board.h @@ -80,7 +80,6 @@ /* USB PD config */ #define CONFIG_USB_PD_PORT_MAX_COUNT 4 -#define CONFIG_INTEL_VIRTUAL_MUX #define CONFIG_USB_MUX_VIRTUAL #define PD_MAX_POWER_MW 60000 @@ -121,19 +120,6 @@ #define I2C_PORT2_BB_RETIMER_ADDR 0x52 #define I2C_PORT3_BB_RETIMER_ADDR 0x53 -/* USB-C port's USB2 & USB3 port numbers */ -#ifdef CONFIG_INTEL_VIRTUAL_MUX - #define TYPE_C_PORT_0_USB2_NUM 1 - #define TYPE_C_PORT_1_USB2_NUM 2 - #define TYPE_C_PORT_2_USB2_NUM 3 - #define TYPE_C_PORT_3_USB2_NUM 5 - - #define TYPE_C_PORT_0_USB3_NUM (0+1) - #define TYPE_C_PORT_1_USB3_NUM (1+1) - #define TYPE_C_PORT_2_USB3_NUM (2+1) - #define TYPE_C_PORT_3_USB3_NUM (3+1) -#endif - /* Enable VCONN */ #define CONFIG_USBC_VCONN #define CONFIG_USBC_VCONN_SWAP diff --git a/board/boldar/board.c b/board/boldar/board.c index 36d91d2f6f..b18674d51f 100644 --- a/board/boldar/board.c +++ b/board/boldar/board.c @@ -323,7 +323,6 @@ static const struct tcpc_config_t tcpc_config_p1_usb3 = { }, .flags = TCPC_FLAGS_TCPCI_REV2_0 | TCPC_FLAGS_TCPCI_REV2_0_NO_VSAFE0V, .drv = &ps8xxx_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }; /* @@ -543,7 +542,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_0_USB2_NUM | (USBC_PORT_0_USB3_NUM << 4), }, [USBC_PORT_C1] = { .bus_type = EC_BUS_TYPE_I2C, @@ -552,7 +550,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }, }; BUILD_ASSERT(ARRAY_SIZE(tcpc_config) == USBC_PORT_COUNT); diff --git a/board/boldar/board.h b/board/boldar/board.h index 5b10629e59..af4ea3e918 100644 --- a/board/boldar/board.h +++ b/board/boldar/board.h @@ -66,17 +66,6 @@ #define CONFIG_USB_PD_PORT_MAX_COUNT 2 -/* - * USB-C port's USB2 & USB3 mapping from schematics - * USB2 numbering on PCH - 1 to n - * USB3 numbering on AP - 0 to n (PMC's USB3 numbering for MUX - * configuration is - 1 to n hence add +1) - */ -#define USBC_PORT_0_USB2_NUM 9 -#define USBC_PORT_0_USB3_NUM 1 -#define USBC_PORT_1_USB2_NUM 4 -#define USBC_PORT_1_USB3_NUM 2 - /* TODO: b/144165680 - measure and check these values on Volteer */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ diff --git a/board/delbin/board.c b/board/delbin/board.c index 7013ee2b78..6ec89b910a 100644 --- a/board/delbin/board.c +++ b/board/delbin/board.c @@ -287,7 +287,6 @@ static const struct tcpc_config_t tcpc_config_p0_usb3 = { }, .flags = TCPC_FLAGS_TCPCI_REV2_0 | TCPC_FLAGS_TCPCI_REV2_0_NO_VSAFE0V, .drv = &ps8xxx_tcpm_drv, - .usb23 = USBC_PORT_0_USB2_NUM | (USBC_PORT_0_USB3_NUM << 4), }; static const struct tcpc_config_t tcpc_config_p1_usb3 = { @@ -298,7 +297,6 @@ static const struct tcpc_config_t tcpc_config_p1_usb3 = { }, .flags = TCPC_FLAGS_TCPCI_REV2_0 | TCPC_FLAGS_TCPCI_REV2_0_NO_VSAFE0V, .drv = &ps8xxx_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }; static const struct usb_mux usbc0_usb3_mb_retimer = { @@ -491,7 +489,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_0_USB2_NUM | (USBC_PORT_0_USB3_NUM << 4), }, [USBC_PORT_C1] = { .bus_type = EC_BUS_TYPE_I2C, @@ -500,7 +497,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }, }; BUILD_ASSERT(ARRAY_SIZE(tcpc_config) == USBC_PORT_COUNT); diff --git a/board/delbin/board.h b/board/delbin/board.h index 39736ca384..57b7341d34 100644 --- a/board/delbin/board.h +++ b/board/delbin/board.h @@ -55,17 +55,6 @@ /* USB Type C and USB PD defines */ #define CONFIG_USB_PD_PORT_MAX_COUNT 2 -/* - * USB-C port's USB2 & USB3 mapping from schematics - * USB2 numbering on PCH - 1 to n - * USB3 numbering on AP - 0 to n (PMC's USB3 numbering for MUX - * configuration is - 1 to n hence add +1) - */ -#define USBC_PORT_0_USB2_NUM 9 -#define USBC_PORT_0_USB3_NUM 1 -#define USBC_PORT_1_USB2_NUM 4 -#define USBC_PORT_1_USB3_NUM 2 - #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ #define PD_VCONN_SWAP_DELAY 5000 /* us */ diff --git a/board/drobit/board.c b/board/drobit/board.c index fc3f4f2190..e236cf0128 100644 --- a/board/drobit/board.c +++ b/board/drobit/board.c @@ -322,7 +322,6 @@ static const struct tcpc_config_t tcpc_config_p1_usb3 = { }, .flags = TCPC_FLAGS_TCPCI_REV2_0 | TCPC_FLAGS_TCPCI_REV2_0_NO_VSAFE0V, .drv = &ps8xxx_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }; /* @@ -542,7 +541,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_0_USB2_NUM | (USBC_PORT_0_USB3_NUM << 4), }, [USBC_PORT_C1] = { .bus_type = EC_BUS_TYPE_I2C, @@ -551,7 +549,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }, }; BUILD_ASSERT(ARRAY_SIZE(tcpc_config) == USBC_PORT_COUNT); diff --git a/board/drobit/board.h b/board/drobit/board.h index d89a0e6d02..e596c414a4 100644 --- a/board/drobit/board.h +++ b/board/drobit/board.h @@ -51,17 +51,6 @@ /* USB Type C and USB PD defines */ #define CONFIG_USB_PD_PORT_MAX_COUNT 2 -/* - * USB-C port's USB2 & USB3 mapping from schematics - * USB2 numbering on PCH - 1 to n - * USB3 numbering on AP - 0 to n (PMC's USB3 numbering for MUX - * configuration is - 1 to n hence add +1) - */ -#define USBC_PORT_0_USB2_NUM 9 -#define USBC_PORT_0_USB3_NUM 1 -#define USBC_PORT_1_USB2_NUM 4 -#define USBC_PORT_1_USB3_NUM 2 - /* TODO: b/144165680 - measure and check these values on Volteer */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ diff --git a/board/eldrid/board.c b/board/eldrid/board.c index 079863e70f..12286dc7b9 100644 --- a/board/eldrid/board.c +++ b/board/eldrid/board.c @@ -261,7 +261,6 @@ static const struct tcpc_config_t tcpc_config_p1_usb3 = { }, .flags = TCPC_FLAGS_TCPCI_REV2_0 | TCPC_FLAGS_TCPCI_REV2_0_NO_VSAFE0V, .drv = &ps8xxx_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }; /* @@ -473,7 +472,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_0_USB2_NUM | (USBC_PORT_0_USB3_NUM << 4), }, [USBC_PORT_C1] = { .bus_type = EC_BUS_TYPE_I2C, @@ -482,7 +480,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }, }; BUILD_ASSERT(ARRAY_SIZE(tcpc_config) == USBC_PORT_COUNT); diff --git a/board/eldrid/board.h b/board/eldrid/board.h index c34f3fa2d4..cb3ffbd0c7 100644 --- a/board/eldrid/board.h +++ b/board/eldrid/board.h @@ -59,17 +59,6 @@ /* USB Type C and USB PD defines */ #define CONFIG_USB_PD_PORT_MAX_COUNT 2 -/* - * USB-C port's USB2 & USB3 mapping from schematics - * USB2 numbering on PCH - 1 to n - * USB3 numbering on AP - 0 to n (PMC's USB3 numbering for MUX - * configuration is - 1 to n hence add +1) - */ -#define USBC_PORT_0_USB2_NUM 9 -#define USBC_PORT_0_USB3_NUM 1 -#define USBC_PORT_1_USB2_NUM 4 -#define USBC_PORT_1_USB3_NUM 2 - /* TODO: b/144165680 - measure and check these values on Volteer */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ diff --git a/board/elemi/board.c b/board/elemi/board.c index 1533207759..b50a141496 100644 --- a/board/elemi/board.c +++ b/board/elemi/board.c @@ -302,7 +302,6 @@ static const struct tcpc_config_t tcpc_config_p1_usb3 = { }, .flags = TCPC_FLAGS_TCPCI_REV2_0 | TCPC_FLAGS_TCPCI_REV2_0_NO_VSAFE0V, .drv = &ps8xxx_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }; /* @@ -522,7 +521,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_0_USB2_NUM | (USBC_PORT_0_USB3_NUM << 4), }, [USBC_PORT_C1] = { .bus_type = EC_BUS_TYPE_I2C, @@ -531,7 +529,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }, }; BUILD_ASSERT(ARRAY_SIZE(tcpc_config) == USBC_PORT_COUNT); diff --git a/board/elemi/board.h b/board/elemi/board.h index fc8ebdcaab..313c450e7a 100644 --- a/board/elemi/board.h +++ b/board/elemi/board.h @@ -54,17 +54,6 @@ /* USB Type C and USB PD defines */ #define CONFIG_USB_PD_PORT_MAX_COUNT 2 -/* - * USB-C port's USB2 & USB3 mapping from schematics - * USB2 numbering on PCH - 1 to n - * USB3 numbering on AP - 0 to n (PMC's USB3 numbering for MUX - * configuration is - 1 to n hence add +1) - */ -#define USBC_PORT_0_USB2_NUM 9 -#define USBC_PORT_0_USB3_NUM 1 -#define USBC_PORT_1_USB2_NUM 4 -#define USBC_PORT_1_USB3_NUM 2 - /* TODO: b/144165680 - measure and check these values on Volteer */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ diff --git a/board/halvor/board.c b/board/halvor/board.c index fc12ccfb85..0e983fefae 100644 --- a/board/halvor/board.c +++ b/board/halvor/board.c @@ -392,7 +392,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_0_USB2_NUM | (USBC_PORT_0_USB3_NUM << 4), }, [USBC_PORT_C1] = { .bus_type = EC_BUS_TYPE_I2C, @@ -401,7 +400,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }, [USBC_PORT_C2] = { .bus_type = EC_BUS_TYPE_I2C, @@ -410,7 +408,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_2_USB2_NUM | (USBC_PORT_2_USB3_NUM << 4), }, }; BUILD_ASSERT(ARRAY_SIZE(tcpc_config) == USBC_PORT_COUNT); diff --git a/board/halvor/board.h b/board/halvor/board.h index f2f7806dfd..850ffd7f43 100644 --- a/board/halvor/board.h +++ b/board/halvor/board.h @@ -44,19 +44,6 @@ /* USB Type C and USB PD defines */ #define CONFIG_USB_PD_PORT_MAX_COUNT 3 -/* - * USB-C port's USB2 & USB3 mapping from schematics - * USB2 numbering on PCH - 1 to n - * USB3 numbering on AP - 0 to n (PMC's USB3 numbering for MUX - * configuration is - 1 to n hence add +1) - */ -#define USBC_PORT_0_USB2_NUM 2 -#define USBC_PORT_0_USB3_NUM 1 -#define USBC_PORT_1_USB2_NUM 4 -#define USBC_PORT_1_USB3_NUM 2 -#define USBC_PORT_2_USB2_NUM 6 -#define USBC_PORT_2_USB3_NUM 3 - #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ #define PD_VCONN_SWAP_DELAY 5000 /* us */ diff --git a/board/lindar/board.c b/board/lindar/board.c index ce30e301c9..801cd6bb5b 100644 --- a/board/lindar/board.c +++ b/board/lindar/board.c @@ -394,7 +394,6 @@ static const struct tcpc_config_t tcpc_config_p1_usb3 = { }, .flags = TCPC_FLAGS_TCPCI_REV2_0 | TCPC_FLAGS_TCPCI_REV2_0_NO_VSAFE0V, .drv = &ps8xxx_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }; static const struct usb_mux usbc1_usb3_db_retimer = { @@ -479,7 +478,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_0_USB2_NUM | (USBC_PORT_0_USB3_NUM << 4), }, [USBC_PORT_C1] = { .bus_type = EC_BUS_TYPE_I2C, @@ -488,7 +486,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }, }; BUILD_ASSERT(ARRAY_SIZE(tcpc_config) == USBC_PORT_COUNT); diff --git a/board/lindar/board.h b/board/lindar/board.h index b4f659a5c3..0ad5edf386 100644 --- a/board/lindar/board.h +++ b/board/lindar/board.h @@ -45,17 +45,6 @@ /* USB Type C and USB PD defines */ #define CONFIG_USB_PD_PORT_MAX_COUNT 2 -/* - * USB-C port's USB2 & USB3 mapping from schematics - * USB2 numbering on PCH - 1 to n - * USB3 numbering on AP - 0 to n (PMC's USB3 numbering for MUX - * configuration is - 1 to n hence add +1) - */ -#define USBC_PORT_0_USB2_NUM 9 -#define USBC_PORT_0_USB3_NUM 1 -#define USBC_PORT_1_USB2_NUM 4 -#define USBC_PORT_1_USB3_NUM 2 - #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ #define PD_VCONN_SWAP_DELAY 5000 /* us */ diff --git a/board/lingcod/board.c b/board/lingcod/board.c index 28edcce5ae..7ae7cf6502 100644 --- a/board/lingcod/board.c +++ b/board/lingcod/board.c @@ -450,7 +450,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_0_USB2_NUM | (USBC_PORT_0_USB3_NUM << 4), }, [USBC_PORT_C1] = { .bus_type = EC_BUS_TYPE_I2C, @@ -459,7 +458,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }, }; BUILD_ASSERT(ARRAY_SIZE(tcpc_config) == USBC_PORT_COUNT); diff --git a/board/lingcod/board.h b/board/lingcod/board.h index d5e4124f27..1f6aa60ea8 100644 --- a/board/lingcod/board.h +++ b/board/lingcod/board.h @@ -45,17 +45,6 @@ /* USB Type C and USB PD defines */ #define CONFIG_USB_PD_PORT_MAX_COUNT 2 -/* - * USB-C port's USB2 & USB3 mapping from schematics - * USB2 numbering on PCH - 1 to n - * USB3 numbering on AP - 0 to n (PMC's USB3 numbering for MUX - * configuration is - 1 to n hence add +1) - */ -#define USBC_PORT_0_USB2_NUM 9 -#define USBC_PORT_0_USB3_NUM 1 -#define USBC_PORT_1_USB2_NUM 4 -#define USBC_PORT_1_USB3_NUM 2 - #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ #define PD_VCONN_SWAP_DELAY 5000 /* us */ diff --git a/board/malefor/board.c b/board/malefor/board.c index 2532369dc8..829e930667 100644 --- a/board/malefor/board.c +++ b/board/malefor/board.c @@ -394,7 +394,6 @@ static const struct tcpc_config_t tcpc_config_p1_usb3 = { }, .flags = TCPC_FLAGS_TCPCI_REV2_0 | TCPC_FLAGS_TCPCI_REV2_0_NO_VSAFE0V, .drv = &ps8xxx_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }; static const struct usb_mux usbc1_usb3_db_retimer = { @@ -504,7 +503,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_0_USB2_NUM | (USBC_PORT_0_USB3_NUM << 4), }, [USBC_PORT_C1] = { .bus_type = EC_BUS_TYPE_I2C, @@ -513,7 +511,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }, }; BUILD_ASSERT(ARRAY_SIZE(tcpc_config) == USBC_PORT_COUNT); diff --git a/board/malefor/board.h b/board/malefor/board.h index 08cc50a2d0..4ba01b3f05 100644 --- a/board/malefor/board.h +++ b/board/malefor/board.h @@ -45,17 +45,6 @@ /* USB Type C and USB PD defines */ #define CONFIG_USB_PD_PORT_MAX_COUNT 2 -/* - * USB-C port's USB2 & USB3 mapping from schematics - * USB2 numbering on PCH - 1 to n - * USB3 numbering on AP - 0 to n (PMC's USB3 numbering for MUX - * configuration is - 1 to n hence add +1) - */ -#define USBC_PORT_0_USB2_NUM 9 -#define USBC_PORT_0_USB3_NUM 1 -#define USBC_PORT_1_USB2_NUM 4 -#define USBC_PORT_1_USB3_NUM 2 - #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ #define PD_VCONN_SWAP_DELAY 5000 /* us */ diff --git a/board/terrador/board.c b/board/terrador/board.c index 22a9b36eaa..b1c8c66c5d 100644 --- a/board/terrador/board.c +++ b/board/terrador/board.c @@ -319,7 +319,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_0_USB2_NUM | (USBC_PORT_0_USB3_NUM << 4), }, [USBC_PORT_C1] = { .bus_type = EC_BUS_TYPE_I2C, @@ -328,7 +327,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }, }; BUILD_ASSERT(ARRAY_SIZE(tcpc_config) == USBC_PORT_COUNT); diff --git a/board/terrador/board.h b/board/terrador/board.h index 6c7fa9fde2..16b1af04b7 100644 --- a/board/terrador/board.h +++ b/board/terrador/board.h @@ -56,17 +56,6 @@ /* USB Type C and USB PD defines */ #define CONFIG_USB_PD_PORT_MAX_COUNT 2 -/* - * USB-C port's USB2 & USB3 mapping from schematics - * USB2 numbering on PCH - 1 to n - * USB3 numbering on AP - 0 to n (PMC's USB3 numbering for MUX - * configuration is - 1 to n hence add +1) - */ -#define USBC_PORT_0_USB2_NUM 9 -#define USBC_PORT_0_USB3_NUM 1 -#define USBC_PORT_1_USB2_NUM 4 -#define USBC_PORT_1_USB3_NUM 2 - #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ #define PD_VCONN_SWAP_DELAY 5000 /* us */ diff --git a/board/tglrvpu_ite/board.c b/board/tglrvpu_ite/board.c index a629059612..3a548b78b2 100644 --- a/board/tglrvpu_ite/board.c +++ b/board/tglrvpu_ite/board.c @@ -89,17 +89,11 @@ const struct tcpc_config_t tcpc_config[] = { .bus_type = EC_BUS_TYPE_EMBEDDED, /* TCPC is embedded within EC so no i2c config needed */ .drv = &it83xx_tcpm_drv, -#ifdef CONFIG_INTEL_VIRTUAL_MUX - .usb23 = TYPE_C_PORT_0_USB2_NUM | (TYPE_C_PORT_0_USB3_NUM << 4), -#endif }, [TYPE_C_PORT_1] = { .bus_type = EC_BUS_TYPE_EMBEDDED, /* TCPC is embedded within EC so no i2c config needed */ .drv = &it83xx_tcpm_drv, -#ifdef CONFIG_INTEL_VIRTUAL_MUX - .usb23 = TYPE_C_PORT_1_USB2_NUM | (TYPE_C_PORT_1_USB3_NUM << 4), -#endif }, }; BUILD_ASSERT(ARRAY_SIZE(tcpc_config) == CONFIG_USB_PD_PORT_MAX_COUNT); diff --git a/board/tglrvpu_ite/board.h b/board/tglrvpu_ite/board.h index 0679c0287f..030f3676d2 100644 --- a/board/tglrvpu_ite/board.h +++ b/board/tglrvpu_ite/board.h @@ -57,22 +57,6 @@ #define CONFIG_USB_PD_TCPM_ITE_ON_CHIP #define CONFIG_USB_PD_ITE_ACTIVE_PORT_COUNT 2 -/* USB-C port's USB2 & USB3 port numbers */ -#if defined(BOARD_TGLRVPU_ITE) || defined(BOARD_TGLRVPU_ITE_TCPMV1) - #define TYPE_C_PORT_0_USB2_NUM 6 - #define TYPE_C_PORT_1_USB2_NUM 7 - - #define TYPE_C_PORT_0_USB3_NUM 3 - #define TYPE_C_PORT_1_USB3_NUM 4 -#else /* BOARD_TGLRVPY_ITE */ - #define TYPE_C_PORT_0_USB2_NUM 6 - #define TYPE_C_PORT_1_USB2_NUM 5 - - #define TYPE_C_PORT_0_USB3_NUM 3 - #define TYPE_C_PORT_1_USB3_NUM 2 -#endif /* BOARD_TGLRVPU_ITE */ - - /* Config BB retimer */ #define CONFIG_USBC_RETIMER_INTEL_BB diff --git a/board/todor/board.c b/board/todor/board.c index 6f189a7c33..85f03661ca 100644 --- a/board/todor/board.c +++ b/board/todor/board.c @@ -345,7 +345,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_0_USB2_NUM | (USBC_PORT_0_USB3_NUM << 4), }, [USBC_PORT_C1] = { .bus_type = EC_BUS_TYPE_I2C, @@ -354,7 +353,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }, }; BUILD_ASSERT(ARRAY_SIZE(tcpc_config) == USBC_PORT_COUNT); diff --git a/board/todor/board.h b/board/todor/board.h index 528b6ec793..d73130cd07 100644 --- a/board/todor/board.h +++ b/board/todor/board.h @@ -56,17 +56,6 @@ /* USB Type C and USB PD defines */ #define CONFIG_USB_PD_PORT_MAX_COUNT 2 -/* - * USB-C port's USB2 & USB3 mapping from schematics - * USB2 numbering on PCH - 1 to n - * USB3 numbering on AP - 0 to n (PMC's USB3 numbering for MUX - * configuration is - 1 to n hence add +1) - */ -#define USBC_PORT_0_USB2_NUM 9 -#define USBC_PORT_0_USB3_NUM 1 -#define USBC_PORT_1_USB2_NUM 4 -#define USBC_PORT_1_USB3_NUM 2 - #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ #define PD_VCONN_SWAP_DELAY 5000 /* us */ diff --git a/board/trondo/board.c b/board/trondo/board.c index 58c74283e4..df924e7f27 100644 --- a/board/trondo/board.c +++ b/board/trondo/board.c @@ -357,7 +357,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_0_USB2_NUM | (USBC_PORT_0_USB3_NUM << 4), }, [USBC_PORT_C1] = { .bus_type = EC_BUS_TYPE_I2C, @@ -366,7 +365,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }, }; BUILD_ASSERT(ARRAY_SIZE(tcpc_config) == USBC_PORT_COUNT); diff --git a/board/trondo/board.h b/board/trondo/board.h index ebe244aff9..5808e07016 100644 --- a/board/trondo/board.h +++ b/board/trondo/board.h @@ -49,17 +49,6 @@ /* USB Type C and USB PD defines */ #define CONFIG_USB_PD_PORT_MAX_COUNT 2 -/* - * USB-C port's USB2 & USB3 mapping from schematics - * USB2 numbering on PCH - 1 to n - * USB3 numbering on AP - 0 to n (PMC's USB3 numbering for MUX - * configuration is - 1 to n hence add +1) - */ -#define USBC_PORT_0_USB2_NUM 9 -#define USBC_PORT_0_USB3_NUM 1 -#define USBC_PORT_1_USB2_NUM 4 -#define USBC_PORT_1_USB3_NUM 2 - #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ #define PD_VCONN_SWAP_DELAY 5000 /* us */ diff --git a/board/voema/board.c b/board/voema/board.c index 32d7eaadb8..f3488c8568 100644 --- a/board/voema/board.c +++ b/board/voema/board.c @@ -323,7 +323,6 @@ static const struct tcpc_config_t tcpc_config_p1_usb3 = { }, .flags = TCPC_FLAGS_TCPCI_REV2_0 | TCPC_FLAGS_TCPCI_REV2_0_NO_VSAFE0V, .drv = &ps8xxx_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }; /* @@ -543,7 +542,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_0_USB2_NUM | (USBC_PORT_0_USB3_NUM << 4), }, [USBC_PORT_C1] = { .bus_type = EC_BUS_TYPE_I2C, @@ -552,7 +550,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }, }; BUILD_ASSERT(ARRAY_SIZE(tcpc_config) == USBC_PORT_COUNT); diff --git a/board/voema/board.h b/board/voema/board.h index 337ee53711..8ce2c4a73b 100644 --- a/board/voema/board.h +++ b/board/voema/board.h @@ -59,17 +59,6 @@ /* USB Type C and USB PD defines */ #define CONFIG_USB_PD_PORT_MAX_COUNT 2 -/* - * USB-C port's USB2 & USB3 mapping from schematics - * USB2 numbering on PCH - 1 to n - * USB3 numbering on AP - 0 to n (PMC's USB3 numbering for MUX - * configuration is - 1 to n hence add +1) - */ -#define USBC_PORT_0_USB2_NUM 9 -#define USBC_PORT_0_USB3_NUM 1 -#define USBC_PORT_1_USB2_NUM 4 -#define USBC_PORT_1_USB3_NUM 2 - /* TODO: b/144165680 - measure and check these values on Volteer */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ diff --git a/board/volteer/board.c b/board/volteer/board.c index a5891b7aed..972394d1c2 100644 --- a/board/volteer/board.c +++ b/board/volteer/board.c @@ -323,7 +323,6 @@ static const struct tcpc_config_t tcpc_config_p1_usb3 = { }, .flags = TCPC_FLAGS_TCPCI_REV2_0 | TCPC_FLAGS_TCPCI_REV2_0_NO_VSAFE0V, .drv = &ps8xxx_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }; /* @@ -543,7 +542,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_0_USB2_NUM | (USBC_PORT_0_USB3_NUM << 4), }, [USBC_PORT_C1] = { .bus_type = EC_BUS_TYPE_I2C, @@ -552,7 +550,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = TUSB422_I2C_ADDR_FLAGS, }, .drv = &tusb422_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }, }; BUILD_ASSERT(ARRAY_SIZE(tcpc_config) == USBC_PORT_COUNT); diff --git a/board/volteer/board.h b/board/volteer/board.h index 5e607db0b1..d4be115677 100644 --- a/board/volteer/board.h +++ b/board/volteer/board.h @@ -59,17 +59,6 @@ /* USB Type C and USB PD defines */ #define CONFIG_USB_PD_PORT_MAX_COUNT 2 -/* - * USB-C port's USB2 & USB3 mapping from schematics - * USB2 numbering on PCH - 1 to n - * USB3 numbering on AP - 0 to n (PMC's USB3 numbering for MUX - * configuration is - 1 to n hence add +1) - */ -#define USBC_PORT_0_USB2_NUM 9 -#define USBC_PORT_0_USB3_NUM 1 -#define USBC_PORT_1_USB2_NUM 4 -#define USBC_PORT_1_USB3_NUM 2 - /* TODO: b/144165680 - measure and check these values on Volteer */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ diff --git a/board/voxel/board.c b/board/voxel/board.c index 6f6b1824fb..1cef3c109d 100644 --- a/board/voxel/board.c +++ b/board/voxel/board.c @@ -346,7 +346,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = RT1715_I2C_ADDR_FLAGS, }, .drv = &rt1715_tcpm_drv, - .usb23 = USBC_PORT_0_USB2_NUM | (USBC_PORT_0_USB3_NUM << 4), }, [USBC_PORT_C1] = { .bus_type = EC_BUS_TYPE_I2C, @@ -355,7 +354,6 @@ struct tcpc_config_t tcpc_config[] = { .addr_flags = RT1715_I2C_ADDR_FLAGS, }, .drv = &rt1715_tcpm_drv, - .usb23 = USBC_PORT_1_USB2_NUM | (USBC_PORT_1_USB3_NUM << 4), }, }; BUILD_ASSERT(ARRAY_SIZE(tcpc_config) == USBC_PORT_COUNT); diff --git a/board/voxel/board.h b/board/voxel/board.h index af975e263b..798207cf29 100644 --- a/board/voxel/board.h +++ b/board/voxel/board.h @@ -56,17 +56,6 @@ /* USB Type C and USB PD defines */ #define CONFIG_USB_PD_PORT_MAX_COUNT 2 -/* - * USB-C port's USB2 & USB3 mapping from schematics - * USB2 numbering on PCH - 1 to n - * USB3 numbering on AP - 0 to n (PMC's USB3 numbering for MUX - * configuration is - 1 to n hence add +1) - */ -#define USBC_PORT_0_USB2_NUM 9 -#define USBC_PORT_0_USB3_NUM 1 -#define USBC_PORT_1_USB2_NUM 4 -#define USBC_PORT_1_USB3_NUM 2 - #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ #define PD_VCONN_SWAP_DELAY 5000 /* us */ |