From 97acbb61584cc967609803dec3f3508396966b30 Mon Sep 17 00:00:00 2001 From: Paul Ma Date: Tue, 10 Mar 2020 09:40:45 +0800 Subject: dalboz: use ps874x and AP internal mux as primary/secondary mux Though AP c1 port mux only support usb, it must be programmed to to a work state rather than leaving it in safe state. BUG=b:150099044 BRANCH=none TEST=build and boot dalboz, usb3 function always work. Change-Id: Ic7e9ae7fd4df68539b42fbd61c23161189703899 Signed-off-by: Paul Ma Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2094844 Reviewed-by: Denis Brockus Reviewed-by: Peichao Li Tested-by: Paul Ma Tested-by: Peichao Li Commit-Queue: Paul Ma --- baseboard/zork/variant_dalboz.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/baseboard/zork/variant_dalboz.c b/baseboard/zork/variant_dalboz.c index 3d7eb3de79..7a8340f5f1 100644 --- a/baseboard/zork/variant_dalboz.c +++ b/baseboard/zork/variant_dalboz.c @@ -58,6 +58,14 @@ const struct usb_mux usbc0_sbu_mux = { .driver = &usbc0_sbu_mux_driver, }; +struct usb_mux usbc1_amd_fp5_usb_mux = { + .usb_port = USBC_PORT_C1, + .i2c_port = I2C_PORT_USB_AP_MUX, + .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, + .driver = &amd_fp5_usb_mux_driver, + .flags = USB_MUX_FLAG_SET_WITHOUT_FLIP, +}; + const struct usb_mux usb_muxes[] = { [USBC_PORT_C0] = { .usb_port = USBC_PORT_C0, @@ -71,6 +79,7 @@ const struct usb_mux usb_muxes[] = { .i2c_port = I2C_PORT_TCPC1, .i2c_addr_flags = 0x10, .driver = &ps874x_usb_mux_driver, + .next_mux = &usbc1_amd_fp5_usb_mux, } }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); -- cgit v1.2.1