summaryrefslogtreecommitdiff
path: root/board/kinox
diff options
context:
space:
mode:
authorTomasz Michalec <tm@semihalf.com>2022-07-20 11:49:48 +0200
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-09-13 11:13:13 +0000
commit1f26c8660e6cc7c44cf40335efdad4b543337628 (patch)
tree118736b1827da2d750c7082ef553cd30d4fced84 /board/kinox
parent331aa7b7a710a288fa01a03d7c1736c6f91d35ca (diff)
downloadchrome-ec-1f26c8660e6cc7c44cf40335efdad4b543337628.tar.gz
brask: usb_mux: Split struct usb_mux in brask boards
Update brask 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: Ifec0efa0dac67a2a1910e3193a7c346a6d36359a Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3779629 Reviewed-by: Keith Short <keithshort@chromium.org> Commit-Queue: Tomasz Michalec <tmichalec@google.com> Tested-by: Tomasz Michalec <tmichalec@google.com>
Diffstat (limited to 'board/kinox')
-rw-r--r--board/kinox/usbc_config.c25
1 files changed, 15 insertions, 10 deletions
diff --git a/board/kinox/usbc_config.c b/board/kinox/usbc_config.c
index 1e70f0d3d5..feeb3be6d1 100644
--- a/board/kinox/usbc_config.c
+++ b/board/kinox/usbc_config.c
@@ -61,19 +61,24 @@ BUILD_ASSERT(ARRAY_SIZE(ppc_chips) == USBC_PORT_COUNT);
unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips);
/* USBC mux configuration - Alder Lake includes internal mux */
-static const struct usb_mux usbc0_usb3_retimer = {
- .usb_port = USBC_PORT_C0,
- .driver = &tcpci_tcpm_usb_mux_driver,
- .hpd_update = &ps8xxx_tcpc_update_hpd_status,
+static const struct usb_mux_chain usbc0_usb3_retimer = {
+ .mux =
+ &(const struct usb_mux){
+ .usb_port = USBC_PORT_C0,
+ .driver = &tcpci_tcpm_usb_mux_driver,
+ .hpd_update = &ps8xxx_tcpc_update_hpd_status,
+ },
};
-const struct usb_mux usb_muxes[] = {
+const struct usb_mux_chain usb_muxes[] = {
[USBC_PORT_C0] = {
- /* PS8815 */
- .usb_port = USBC_PORT_C0,
- .driver = &virtual_usb_mux_driver,
- .hpd_update = &virtual_hpd_update,
- .next_mux = &usbc0_usb3_retimer,
+ .mux = &(const struct usb_mux) {
+ /* PS8815 */
+ .usb_port = USBC_PORT_C0,
+ .driver = &virtual_usb_mux_driver,
+ .hpd_update = &virtual_hpd_update,
+ },
+ .next = &usbc0_usb3_retimer,
},
};
BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT);