diff options
author | Tomasz Michalec <tm@semihalf.com> | 2022-07-20 13:43:44 +0200 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-09-13 11:16:47 +0000 |
commit | 61e268f87c3af06ecf02230d049a95a911433c4c (patch) | |
tree | 20977f7a3acb78fa08117ee11bed7423205915a9 | |
parent | 907eef0c843b393316c430a7779b1e5a2d3c8294 (diff) | |
download | chrome-ec-61e268f87c3af06ecf02230d049a95a911433c4c.tar.gz |
mchpevb1: usb_mux: Split struct usb_mux in mchpevb1 board
Update mchpevb1 boards to use new struct usb_mux_chain.
BUG=b:236274003
TEST=make buildall
BRANCH=None
Cq-Depend: chromium:3748785
Signed-off-by: Tomasz Michalec <tm@semihalf.com>
Change-Id: Ib6bb181fcf462b32bdf291dfc04d78f5e197a211
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3780410
Reviewed-by: Keith Short <keithshort@chromium.org>
Tested-by: Tomasz Michalec <tmichalec@google.com>
Commit-Queue: Tomasz Michalec <tmichalec@google.com>
-rw-r--r-- | board/mchpevb1/board.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/board/mchpevb1/board.c b/board/mchpevb1/board.c index 5ecf3a6e08..23135108f6 100644 --- a/board/mchpevb1/board.c +++ b/board/mchpevb1/board.c @@ -349,18 +349,24 @@ struct pi3usb9281_config pi3usb9281_chips[] = { BUILD_ASSERT(ARRAY_SIZE(pi3usb9281_chips) == CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT); -struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, - .driver = &pi3usb3x532_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, + .driver = &pi3usb3x532_usb_mux_driver, + }, }, { - .usb_port = 1, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = 0x10, - .driver = &ps8740_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_USB_MUX, + .i2c_addr_flags = 0x10, + .driver = &ps8740_usb_mux_driver, + }, } }; #endif |