From ad86e9cea45724d7d686f45f1d48a476f81afc2e Mon Sep 17 00:00:00 2001 From: Caveh Jalali Date: Wed, 23 Sep 2020 14:06:53 -0700 Subject: usb: Remove references to usb23 The TCSS port mapping is not used by the EC and the higher layers no longer query the EC for this mapping. We can remove this feature and disable CONFIG_INTEL_VIRTUAL_MUX which was added to enable it. BRANCH=none BUG=b:153941950 TEST=buildall passes Change-Id: I2d7f51212f3e64d74827d7f82654eb93534b8db4 Signed-off-by: Caveh Jalali Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2427632 Reviewed-by: Keith Short Reviewed-by: Vijay P Hiremath Commit-Queue: Keith Short --- board/boldar/board.c | 3 --- board/boldar/board.h | 11 ----------- 2 files changed, 14 deletions(-) (limited to 'board/boldar') 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 */ -- cgit v1.2.1