diff options
Diffstat (limited to 'board')
| -rw-r--r-- | board/chell/usb_pd_policy.c | 4 | ||||
| -rw-r--r-- | board/coffeecake/usb_pd_policy.c | 5 | ||||
| -rw-r--r-- | board/dingdong/usb_pd_policy.c | 5 | ||||
| -rw-r--r-- | board/hoho/usb_pd_policy.c | 5 | ||||
| -rw-r--r-- | board/pdeval-stm32f072/usb_pd_policy.c | 2 | ||||
| -rw-r--r-- | board/plankton/usb_pd_policy.c | 2 | ||||
| -rw-r--r-- | board/servo_v4/board.c | 4 | ||||
| -rw-r--r-- | board/servo_v4/usb_pd_policy.c | 4 |
8 files changed, 20 insertions, 11 deletions
diff --git a/board/chell/usb_pd_policy.c b/board/chell/usb_pd_policy.c index 478f656de2..2123c45d86 100644 --- a/board/chell/usb_pd_policy.c +++ b/board/chell/usb_pd_policy.c @@ -228,7 +228,7 @@ static int svdm_enter_dp_mode(int port, uint32_t mode_caps) static int svdm_dp_status(int port, uint32_t *payload) { - int opos = pd_alt_mode(port, USB_SID_DISPLAYPORT); + int opos = pd_alt_mode(port, TCPC_TX_SOP, USB_SID_DISPLAYPORT); payload[0] = VDO(USB_SID_DISPLAYPORT, 1, CMD_DP_STATUS | VDO_OPOS(opos)); @@ -245,7 +245,7 @@ static int svdm_dp_status(int port, uint32_t *payload) static int svdm_dp_config(int port, uint32_t *payload) { - int opos = pd_alt_mode(port, USB_SID_DISPLAYPORT); + int opos = pd_alt_mode(port, TCPC_TX_SOP, USB_SID_DISPLAYPORT); int mf_pref = PD_VDO_DPSTS_MF_PREF(dp_status[port]); int pin_mode = pd_dfp_dp_get_pin_mode(port, dp_status[port]); diff --git a/board/coffeecake/usb_pd_policy.c b/board/coffeecake/usb_pd_policy.c index 99a0faec83..6da20a5b37 100644 --- a/board/coffeecake/usb_pd_policy.c +++ b/board/coffeecake/usb_pd_policy.c @@ -266,8 +266,11 @@ static int svdm_enter_mode(int port, uint32_t *payload) return rv; } -int pd_alt_mode(int port, uint16_t svid) +int pd_alt_mode(int port, enum tcpm_transmit_type type, uint16_t svid) { + if (type != TCPC_TX_SOP) + return 0; + if (svid == USB_SID_DISPLAYPORT) return alt_mode[PD_AMODE_DISPLAYPORT]; else if (svid == USB_VID_GOOGLE) diff --git a/board/dingdong/usb_pd_policy.c b/board/dingdong/usb_pd_policy.c index a4bfec541d..f17802c82a 100644 --- a/board/dingdong/usb_pd_policy.c +++ b/board/dingdong/usb_pd_policy.c @@ -219,8 +219,11 @@ static int svdm_enter_mode(int port, uint32_t *payload) return rv; } -int pd_alt_mode(int port, uint16_t svid) +int pd_alt_mode(int port, enum tcpm_transmit_type type, uint16_t svid) { + if (type != TCPC_TX_SOP) + return 0; + if (svid == USB_SID_DISPLAYPORT) return alt_mode[PD_AMODE_DISPLAYPORT]; else if (svid == USB_VID_GOOGLE) diff --git a/board/hoho/usb_pd_policy.c b/board/hoho/usb_pd_policy.c index 9bc8d3aa2f..4fe82320e8 100644 --- a/board/hoho/usb_pd_policy.c +++ b/board/hoho/usb_pd_policy.c @@ -194,8 +194,11 @@ static int svdm_enter_mode(int port, uint32_t *payload) return rv; } -int pd_alt_mode(int port, uint16_t svid) +int pd_alt_mode(int port, enum tcpm_transmit_type type, uint16_t svid) { + if (type != TCPC_TX_SOP) + return 0; + if (svid == USB_SID_DISPLAYPORT) return alt_mode[PD_AMODE_DISPLAYPORT]; else if (svid == USB_VID_GOOGLE) diff --git a/board/pdeval-stm32f072/usb_pd_policy.c b/board/pdeval-stm32f072/usb_pd_policy.c index 775f8b8876..78026c9e7b 100644 --- a/board/pdeval-stm32f072/usb_pd_policy.c +++ b/board/pdeval-stm32f072/usb_pd_policy.c @@ -199,7 +199,7 @@ __override void svdm_safe_dp_mode(int port) __override int svdm_dp_config(int port, uint32_t *payload) { - int opos = pd_alt_mode(port, USB_SID_DISPLAYPORT); + int opos = pd_alt_mode(port, TCPC_TX_SOP, USB_SID_DISPLAYPORT); int pin_mode = pd_dfp_dp_get_pin_mode(port, dp_status[port]); #if defined(CONFIG_USB_PD_TCPM_MUX) && defined(CONFIG_USB_PD_TCPM_ANX7447) const struct usb_mux *mux = &usb_muxes[port]; diff --git a/board/plankton/usb_pd_policy.c b/board/plankton/usb_pd_policy.c index 87718648f1..f6701ab65e 100644 --- a/board/plankton/usb_pd_policy.c +++ b/board/plankton/usb_pd_policy.c @@ -236,7 +236,7 @@ int svdm_enter_mode(int port, uint32_t *payload) return 1; } -int pd_alt_mode(int port, uint16_t svid) +int pd_alt_mode(int port, enum tcpm_transmit_type type, uint16_t svid) { return alt_mode; } diff --git a/board/servo_v4/board.c b/board/servo_v4/board.c index 559b9bb5b0..fc6735e19c 100644 --- a/board/servo_v4/board.c +++ b/board/servo_v4/board.c @@ -78,7 +78,7 @@ static volatile int hpd_prev_level; void hpd_irq_deferred(void) { - int dp_mode = pd_alt_mode(1, USB_SID_DISPLAYPORT); + int dp_mode = pd_alt_mode(1, TCPC_TX_SOP, USB_SID_DISPLAYPORT); if (dp_mode) { pd_send_hpd(DUT, hpd_irq); @@ -90,7 +90,7 @@ DECLARE_DEFERRED(hpd_irq_deferred); void hpd_lvl_deferred(void) { int level = gpio_get_level(GPIO_DP_HPD); - int dp_mode = pd_alt_mode(1, USB_SID_DISPLAYPORT); + int dp_mode = pd_alt_mode(1, TCPC_TX_SOP, USB_SID_DISPLAYPORT); if (level != hpd_prev_level) { /* It's a glitch while in deferred or canceled action */ diff --git a/board/servo_v4/usb_pd_policy.c b/board/servo_v4/usb_pd_policy.c index a8a6b8ee1f..b87130fbc8 100644 --- a/board/servo_v4/usb_pd_policy.c +++ b/board/servo_v4/usb_pd_policy.c @@ -950,9 +950,9 @@ static int svdm_enter_mode(int port, uint32_t *payload) return 1; } -int pd_alt_mode(int port, uint16_t svid) +int pd_alt_mode(int port, enum tcpm_transmit_type type, uint16_t svid) { - if (svid == USB_SID_DISPLAYPORT) + if (type == TCPC_TX_SOP && svid == USB_SID_DISPLAYPORT) return alt_mode; return 0; |