summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTing Shen <phoenixshen@google.com>2022-01-14 12:57:31 +0800
committerCommit Bot <commit-bot@chromium.org>2022-01-14 08:48:55 +0000
commit2dc7d4c8ad0f1a5e831ed7c3863343204aa87d61 (patch)
tree367fcbbfa3058c8439c05a039e6cc9c5efaebc18
parentc7a7ee333342a1a5a94309a1ee966282ef83ed13 (diff)
downloadchrome-ec-2dc7d4c8ad0f1a5e831ed7c3863343204aa87d61.tar.gz
cherry: remove virtual mux driver
Cherry does not have host-controlled mux, thus this is not needed. BUG=b:213122469 TEST=no USB_MUX host event sent to AP BRANCH=main Signed-off-by: Ting Shen <phoenixshen@google.com> Change-Id: Ic51e56429d15a881f0ff2fc46083fc227d5dc85d Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3388594 Reviewed-by: Eric Yilun Lin <yllin@google.com> Reviewed-by: Chen-Yu Tsai <wenst@chromium.org> Commit-Queue: Ting Shen <phoenixshen@chromium.org> Tested-by: Ting Shen <phoenixshen@chromium.org>
-rw-r--r--baseboard/cherry/baseboard.c14
-rw-r--r--baseboard/cherry/baseboard.h1
2 files changed, 0 insertions, 15 deletions
diff --git a/baseboard/cherry/baseboard.c b/baseboard/cherry/baseboard.c
index 89a9c11439..b93df83975 100644
--- a/baseboard/cherry/baseboard.c
+++ b/baseboard/cherry/baseboard.c
@@ -270,18 +270,6 @@ __maybe_unused void xhci_init_done_interrupt(enum gpio_signal signal)
/* USB Mux */
-const struct usb_mux usbc0_virtual_mux = {
- .usb_port = 0,
- .driver = &virtual_usb_mux_driver,
- .hpd_update = &virtual_hpd_update,
-};
-
-const struct usb_mux usbc1_virtual_mux = {
- .usb_port = 1,
- .driver = &virtual_usb_mux_driver,
- .hpd_update = &virtual_hpd_update,
-};
-
static int board_ps8762_mux_set(const struct usb_mux *me,
mux_state_t mux_state)
{
@@ -334,7 +322,6 @@ const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = {
.i2c_port = I2C_PORT_USB_MUX0,
.i2c_addr_flags = PS8802_I2C_ADDR_FLAGS,
.driver = &ps8802_usb_mux_driver,
- .next_mux = &usbc0_virtual_mux,
.board_init = &board_ps8762_mux_init,
.board_set = &board_ps8762_mux_set,
},
@@ -343,7 +330,6 @@ const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = {
.i2c_port = I2C_PORT_USB_MUX1,
.i2c_addr_flags = ANX3443_I2C_ADDR0_FLAGS,
.driver = &anx3443_usb_mux_driver,
- .next_mux = &usbc1_virtual_mux,
.board_set = &board_anx3443_mux_set,
},
};
diff --git a/baseboard/cherry/baseboard.h b/baseboard/cherry/baseboard.h
index d810b1d7b7..7b9c52076a 100644
--- a/baseboard/cherry/baseboard.h
+++ b/baseboard/cherry/baseboard.h
@@ -125,7 +125,6 @@
#define CONFIG_USB_DRP_ACC_TRYSRC
#define CONFIG_USBC_RETIMER_PS8802 /* C0 */
#define CONFIG_USB_MUX_ANX3443 /* C1 */
-#define CONFIG_USB_MUX_VIRTUAL
#define CONFIG_USB_PD_ALT_MODE
#define CONFIG_USB_PD_ALT_MODE_DFP
#define CONFIG_USB_PD_DECODE_SOP