summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/usb_common.c23
-rw-r--r--common/usb_pd_policy.c4
-rw-r--r--common/usb_pd_protocol.c18
-rw-r--r--common/usbc/usb_tc_drp_acc_trysrc_sm.c22
4 files changed, 34 insertions, 33 deletions
diff --git a/common/usb_common.c b/common/usb_common.c
index 3ab01430bd..aeab0bdfdd 100644
--- a/common/usb_common.c
+++ b/common/usb_common.c
@@ -486,7 +486,7 @@ enum pd_drp_next_states drp_auto_toggle_next_state(
}
}
-static enum typec_mux get_mux_mode_to_set(int port)
+mux_state_t get_mux_mode_to_set(int port)
{
/*
* If the SoC is down, then we disconnect the MUX to save power since
@@ -494,7 +494,7 @@ static enum typec_mux get_mux_mode_to_set(int port)
*/
if (IS_ENABLED(CONFIG_POWER_COMMON) &&
chipset_in_or_transitioning_to_state(CHIPSET_STATE_ANY_OFF))
- return TYPEC_MUX_NONE;
+ return USB_PD_MUX_NONE;
/*
* When PD stack is disconnected, then mux should be disconnected, which
@@ -503,13 +503,13 @@ static enum typec_mux get_mux_mode_to_set(int port)
* be set correctly again.
*/
if (pd_is_disconnected(port))
- return TYPEC_MUX_NONE;
+ return USB_PD_MUX_NONE;
/* If new data role isn't DFP & we only support DFP, also disconnect. */
if (IS_ENABLED(CONFIG_USB_PD_DUAL_ROLE) &&
IS_ENABLED(CONFIG_USBC_SS_MUX_DFP_ONLY) &&
pd_get_data_role(port) != PD_ROLE_DFP)
- return TYPEC_MUX_NONE;
+ return USB_PD_MUX_NONE;
/*
* If the power role is sink and the partner device is not capable
@@ -518,17 +518,18 @@ static enum typec_mux get_mux_mode_to_set(int port)
if (IS_ENABLED(CONFIG_USB_PD_DUAL_ROLE) &&
pd_get_power_role(port) == PD_ROLE_SINK &&
!pd_get_partner_usb_comm_capable(port))
- return TYPEC_MUX_NONE;
+ return USB_PD_MUX_NONE;
/* Otherwise connect mux since we are in S3+ */
- return TYPEC_MUX_USB;
+ return USB_PD_MUX_USB_ENABLED;
}
void set_usb_mux_with_current_data_role(int port)
{
if (IS_ENABLED(CONFIG_USBC_SS_MUX)) {
- enum typec_mux mux_mode = get_mux_mode_to_set(port);
- enum usb_switch usb_switch_mode = (mux_mode == TYPEC_MUX_NONE) ?
+ mux_state_t mux_mode = get_mux_mode_to_set(port);
+ enum usb_switch usb_switch_mode =
+ (mux_mode == USB_PD_MUX_NONE) ?
USB_SWITCH_DISCONNECT : USB_SWITCH_CONNECT;
usb_mux_set(port, mux_mode, usb_switch_mode,
@@ -783,7 +784,7 @@ __overridable int pd_custom_vdm(int port, int cnt, uint32_t *payload,
void usb_mux_set_safe_mode(int port)
{
usb_mux_set(port, IS_ENABLED(CONFIG_USB_MUX_VIRTUAL) ?
- TYPEC_MUX_SAFE : TYPEC_MUX_NONE,
+ USB_PD_MUX_SAFE_MODE : USB_PD_MUX_NONE,
USB_SWITCH_CONNECT, pd_get_polarity(port));
/* Isolate the SBU lines. */
@@ -870,7 +871,7 @@ __overridable int svdm_dp_config(int port, uint32_t *payload)
int opos = pd_alt_mode(port, USB_SID_DISPLAYPORT);
int mf_pref = PD_VDO_DPSTS_MF_PREF(dp_status[port]);
uint8_t pin_mode = get_dp_pin_mode(port);
- enum typec_mux mux_mode;
+ mux_state_t mux_mode;
if (!pin_mode)
return 0;
@@ -880,7 +881,7 @@ __overridable int svdm_dp_config(int port, uint32_t *payload)
* supported.
*/
mux_mode = ((pin_mode & MODE_DP_PIN_MF_MASK) && mf_pref) ?
- TYPEC_MUX_DOCK : TYPEC_MUX_DP;
+ USB_PD_MUX_DOCK : USB_PD_MUX_DP_ENABLED;
CPRINTS("pin_mode: %x, mf: %d, mux: %d", pin_mode, mf_pref, mux_mode);
/* Connect the SBU and USB lines to the connector. */
diff --git a/common/usb_pd_policy.c b/common/usb_pd_policy.c
index 685bf061a2..f220293434 100644
--- a/common/usb_pd_policy.c
+++ b/common/usb_pd_policy.c
@@ -286,8 +286,8 @@ static void set_tbt_compat_mode_ready(int port)
ppc_set_sbu(port, 1);
/* Set usb mux to Thunderbolt-compatible mode */
- usb_mux_set(port, TYPEC_MUX_TBT_COMPAT, USB_SWITCH_CONNECT,
- pd_get_polarity(port));
+ usb_mux_set(port, USB_PD_MUX_TBT_COMPAT_ENABLED,
+ USB_SWITCH_CONNECT, pd_get_polarity(port));
}
}
diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c
index 9188f2720b..c2d937e8ef 100644
--- a/common/usb_pd_protocol.c
+++ b/common/usb_pd_protocol.c
@@ -832,7 +832,7 @@ static inline void set_state(int port, enum pd_states next_state)
*/
pd_execute_data_swap(port, PD_ROLE_DFP);
#ifdef CONFIG_USBC_SS_MUX
- usb_mux_set(port, TYPEC_MUX_NONE, USB_SWITCH_DISCONNECT,
+ usb_mux_set(port, USB_PD_MUX_NONE, USB_SWITCH_DISCONNECT,
pd[port].polarity);
#endif
/* Disable TCPC RX */
@@ -3389,7 +3389,7 @@ void pd_task(void *u)
PD_ROLE_VCONN_OFF);
#endif /* CONFIG_USBC_VCONN */
#ifdef CONFIG_USBC_SS_MUX
- usb_mux_set(port, TYPEC_MUX_NONE,
+ usb_mux_set(port, USB_PD_MUX_NONE,
USB_SWITCH_DISCONNECT,
pd[port].polarity);
#endif /* CONFIG_USBC_SS_MUX */
@@ -5356,12 +5356,12 @@ static const enum pd_dual_role_states dual_role_map[USB_PD_CTRL_ROLE_COUNT] = {
#endif
#ifdef CONFIG_USBC_SS_MUX
-static const enum typec_mux typec_mux_map[USB_PD_CTRL_MUX_COUNT] = {
- [USB_PD_CTRL_MUX_NONE] = TYPEC_MUX_NONE,
- [USB_PD_CTRL_MUX_USB] = TYPEC_MUX_USB,
- [USB_PD_CTRL_MUX_AUTO] = TYPEC_MUX_DP,
- [USB_PD_CTRL_MUX_DP] = TYPEC_MUX_DP,
- [USB_PD_CTRL_MUX_DOCK] = TYPEC_MUX_DOCK,
+static const mux_state_t typec_mux_map[USB_PD_CTRL_MUX_COUNT] = {
+ [USB_PD_CTRL_MUX_NONE] = USB_PD_MUX_NONE,
+ [USB_PD_CTRL_MUX_USB] = USB_PD_MUX_USB_ENABLED,
+ [USB_PD_CTRL_MUX_AUTO] = USB_PD_MUX_DP_ENABLED,
+ [USB_PD_CTRL_MUX_DP] = USB_PD_MUX_DP_ENABLED,
+ [USB_PD_CTRL_MUX_DOCK] = USB_PD_MUX_DOCK,
};
#endif
@@ -5412,7 +5412,7 @@ static enum ec_status hc_usb_pd_control(struct host_cmd_handler_args *args)
#ifdef CONFIG_USBC_SS_MUX
if (p->mux != USB_PD_CTRL_MUX_NO_CHANGE)
usb_mux_set(p->port, typec_mux_map[p->mux],
- typec_mux_map[p->mux] == TYPEC_MUX_NONE ?
+ typec_mux_map[p->mux] == USB_PD_MUX_NONE ?
USB_SWITCH_DISCONNECT :
USB_SWITCH_CONNECT,
pd_get_polarity(p->port));
diff --git a/common/usbc/usb_tc_drp_acc_trysrc_sm.c b/common/usbc/usb_tc_drp_acc_trysrc_sm.c
index 06c2b82e50..5e7fd25319 100644
--- a/common/usbc/usb_tc_drp_acc_trysrc_sm.c
+++ b/common/usbc/usb_tc_drp_acc_trysrc_sm.c
@@ -1191,12 +1191,12 @@ static const enum pd_dual_role_states dual_role_map[USB_PD_CTRL_ROLE_COUNT] = {
};
#ifdef CONFIG_USBC_SS_MUX
-static const enum typec_mux typec_mux_map[USB_PD_CTRL_MUX_COUNT] = {
- [USB_PD_CTRL_MUX_NONE] = TYPEC_MUX_NONE,
- [USB_PD_CTRL_MUX_USB] = TYPEC_MUX_USB,
- [USB_PD_CTRL_MUX_AUTO] = TYPEC_MUX_DP,
- [USB_PD_CTRL_MUX_DP] = TYPEC_MUX_DP,
- [USB_PD_CTRL_MUX_DOCK] = TYPEC_MUX_DOCK,
+static const mux_state_t typec_mux_map[USB_PD_CTRL_MUX_COUNT] = {
+ [USB_PD_CTRL_MUX_NONE] = USB_PD_MUX_NONE,
+ [USB_PD_CTRL_MUX_USB] = USB_PD_MUX_USB_ENABLED,
+ [USB_PD_CTRL_MUX_AUTO] = USB_PD_MUX_DP_ENABLED,
+ [USB_PD_CTRL_MUX_DP] = USB_PD_MUX_DP_ENABLED,
+ [USB_PD_CTRL_MUX_DOCK] = USB_PD_MUX_DOCK,
};
#endif
@@ -1223,7 +1223,7 @@ static enum ec_status hc_usb_pd_control(struct host_cmd_handler_args *args)
#ifdef CONFIG_USBC_SS_MUX
if (p->mux != USB_PD_CTRL_MUX_NO_CHANGE)
usb_mux_set(p->port, typec_mux_map[p->mux],
- typec_mux_map[p->mux] == TYPEC_MUX_NONE ?
+ typec_mux_map[p->mux] == USB_PD_MUX_NONE ?
USB_SWITCH_DISCONNECT :
USB_SWITCH_CONNECT,
pd_get_polarity(p->port));
@@ -1676,7 +1676,7 @@ static void tc_unattached_snk_entry(const int port)
tc[port].next_role_swap = get_time().val + PD_T_DRP_SNK;
if (IS_ENABLED(CONFIG_USBC_SS_MUX))
- usb_mux_set(port, TYPEC_MUX_NONE,
+ usb_mux_set(port, USB_PD_MUX_NONE,
USB_SWITCH_DISCONNECT, tc[port].polarity);
if (IS_ENABLED(CONFIG_USB_PE_SM)) {
@@ -2076,7 +2076,7 @@ static void tc_unoriented_dbg_acc_src_entry(const int port)
/* Enable VBUS */
if (pd_set_power_supply_ready(port)) {
if (IS_ENABLED(CONFIG_USBC_SS_MUX))
- usb_mux_set(port, TYPEC_MUX_NONE,
+ usb_mux_set(port, USB_PD_MUX_NONE,
USB_SWITCH_DISCONNECT, tc[port].polarity);
}
@@ -2558,7 +2558,7 @@ static void tc_attached_src_entry(const int port)
set_vconn(port, 0);
if (IS_ENABLED(CONFIG_USBC_SS_MUX))
- usb_mux_set(port, TYPEC_MUX_NONE,
+ usb_mux_set(port, USB_PD_MUX_NONE,
USB_SWITCH_DISCONNECT, tc[port].polarity);
}
@@ -2592,7 +2592,7 @@ static void tc_attached_src_entry(const int port)
set_vconn(port, 0);
if (IS_ENABLED(CONFIG_USBC_SS_MUX))
- usb_mux_set(port, TYPEC_MUX_NONE,
+ usb_mux_set(port, USB_PD_MUX_NONE,
USB_SWITCH_DISCONNECT, tc[port].polarity);
}
#endif /* CONFIG_USB_PE_SM */
View Lorry Controller Status