diff options
| author | Tomasz Michalec <tm@semihalf.com> | 2022-07-20 12:08:34 +0200 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-09-13 11:14:06 +0000 |
| commit | f294a1d96ca1072d5c949697632cfdb7de57f27e (patch) | |
| tree | 6b1c6a718c712aba6c1ece66d5bd7f98c81c81af | |
| parent | 23ac6befd1b5cde6a815f3e08c1c3dd0a49b34ea (diff) | |
| download | chrome-ec-f294a1d96ca1072d5c949697632cfdb7de57f27e.tar.gz | |
oak: usb_mux: Split struct usb_mux in oak boards
Update oak 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: I7ae4c9e7374a94f9fc45f5db7194baad9bc7c21d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3779634
Commit-Queue: Tomasz Michalec <tmichalec@google.com>
Reviewed-by: Keith Short <keithshort@chromium.org>
Tested-by: Tomasz Michalec <tmichalec@google.com>
| -rw-r--r-- | board/elm/board.c | 9 | ||||
| -rw-r--r-- | board/oak/board.c | 28 |
2 files changed, 23 insertions, 14 deletions
diff --git a/board/elm/board.c b/board/elm/board.c index 30462dd43b..4007d34379 100644 --- a/board/elm/board.c +++ b/board/elm/board.c @@ -168,10 +168,13 @@ const struct temp_sensor_t temp_sensors[] = { }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .usb_port = 0, - .driver = &anx7688_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &anx7688_usb_mux_driver, + }, }, }; diff --git a/board/oak/board.c b/board/oak/board.c index d927129efb..468b6e6677 100644 --- a/board/oak/board.c +++ b/board/oak/board.c @@ -195,23 +195,29 @@ struct als_t als[] = { BUILD_ASSERT(ARRAY_SIZE(als) == ALS_COUNT); #endif -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const 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, + .mux = + &(const struct usb_mux){ + .usb_port = 1, + .i2c_port = I2C_PORT_USB_MUX, #if (BOARD_REV <= OAK_REV4) - .i2c_addr_flags = PI3USB3X532_I2C_ADDR1, - .driver = &pi3usb3x532_usb_mux_driver, + .i2c_addr_flags = PI3USB3X532_I2C_ADDR1, + .driver = &pi3usb3x532_usb_mux_driver, #else - .i2c_addr_flags = 0x10, - .driver = &ps8740_usb_mux_driver, + .i2c_addr_flags = 0x10, + .driver = &ps8740_usb_mux_driver, #endif + }, }, }; |