diff options
| author | Tomasz Michalec <tm@semihalf.com> | 2022-07-20 13:44:26 +0200 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-09-13 11:17:00 +0000 |
| commit | bea6d75e10d14e5efe0e7f9f51b97d1a2f6d4b7d (patch) | |
| tree | b987dc549bbd2f381195c61aaa1ada6c801ceff4 | |
| parent | 61e268f87c3af06ecf02230d049a95a911433c4c (diff) | |
| download | chrome-ec-bea6d75e10d14e5efe0e7f9f51b97d1a2f6d4b7d.tar.gz | |
pdeval-stm32f072: usb_mux: Split struct usb_mux in pdeval-stm32f072
Update pdeval-stm32f072 board 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: I350f336f61e089460efc14312dac80c3764d61c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3780411
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/pdeval-stm32f072/usb_pd_policy.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/board/pdeval-stm32f072/usb_pd_policy.c b/board/pdeval-stm32f072/usb_pd_policy.c index 269befe740..df41d0c77a 100644 --- a/board/pdeval-stm32f072/usb_pd_policy.c +++ b/board/pdeval-stm32f072/usb_pd_policy.c @@ -24,10 +24,13 @@ static int vbus_present; #if defined(CONFIG_USB_PD_TCPM_MUX) && defined(CONFIG_USB_PD_TCPM_ANX7447) -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 = &anx7447_usb_mux_driver, + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .driver = &anx7447_usb_mux_driver, + }, }, }; #endif @@ -187,7 +190,7 @@ __override int svdm_dp_config(int port, uint32_t *payload) int pin_mode = pd_dfp_dp_get_pin_mode(port, dp_status[port]); bool unused; #if defined(CONFIG_USB_PD_TCPM_MUX) && defined(CONFIG_USB_PD_TCPM_ANX7447) - const struct usb_mux *mux = &usb_muxes[port]; + const struct usb_mux *mux = usb_muxes[port].mux; #endif #ifdef CONFIG_USB_PD_TCPM_ANX7447 @@ -236,7 +239,7 @@ __override int svdm_dp_config(int port, uint32_t *payload) __override void svdm_dp_post_config(int port) { bool unused; - const struct usb_mux *mux = &usb_muxes[port]; + const struct usb_mux *mux = usb_muxes[port].mux; dp_flags[port] |= DP_FLAGS_DP_ON; if (!(dp_flags[port] & DP_FLAGS_HPD_HI_PENDING)) @@ -254,7 +257,7 @@ __override int svdm_dp_attention(int port, uint32_t *payload) #ifdef CONFIG_USB_PD_TCPM_ANX7447 int lvl = PD_VDO_DPSTS_HPD_LVL(payload[1]); int irq = PD_VDO_DPSTS_HPD_IRQ(payload[1]); - const struct usb_mux *mux = &usb_muxes[port]; + const struct usb_mux *mux = usb_muxes[port].mux; bool unused; mux_state_t mux_state = |