usb_mux: cleanup: Replace mux state enums with ec_command bit flag

BUG=b:145796172
BRANCH=none
TEST=make buildall -j

Change-Id: Ie4ffaf208745764262931501f0dff77b525a4e59
Signed-off-by: Vijay Hiremath <vijay.p.hiremath@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2017569
Reviewed-by: Jett Rink <jettrink@chromium.org>

4 files changed, 30 insertions, 27 deletions

diff --git a/baseboard/grunt/usb_pd_policy.c b/baseboard/grunt/usb_pd_policy.c
index 9ec482c750..4edee5f232 100644
--- a/baseboard/grunt/usb_pd_policy.c
+++ b/baseboard/grunt/usb_pd_policy.c
@@ -80,7 +80,7 @@ int board_vbus_source_enabled(int port)
 
 /* ----------------- Vendor Defined Messages ------------------ */
 #ifdef CONFIG_USB_PD_ALT_MODE_DFP
-static enum typec_mux svdm_dp_mux_mode(int port)
+mux_state_t svdm_dp_mux_mode(int port)
 {
 	int mf_pref = PD_VDO_DPSTS_MF_PREF(dp_status[port]);
 	int pin_mode = pd_dfp_dp_get_pin_mode(port, dp_status[port]);
@@ -89,9 +89,9 @@ static enum typec_mux svdm_dp_mux_mode(int port)
 	 * supported.
 	 */
 	if ((pin_mode & MODE_DP_PIN_MF_MASK) && mf_pref)
-		return TYPEC_MUX_DOCK;
+		return USB_PD_MUX_DOCK;
 	else
-		return TYPEC_MUX_DP;
+		return USB_PD_MUX_DP_ENABLED;
 }
 
 __override int svdm_dp_config(int port, uint32_t *payload)
@@ -99,7 +99,7 @@ __override 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]);
 	int pin_mode = pd_dfp_dp_get_pin_mode(port, dp_status[port]);
-	enum typec_mux mux_mode = svdm_dp_mux_mode(port);
+	mux_state_t mux_mode = svdm_dp_mux_mode(port);
 
 	if (!pin_mode)
 		return 0;
@@ -108,13 +108,14 @@ __override int svdm_dp_config(int port, uint32_t *payload)
 
 	/*
 	 * Place the USB Type-C pins that are to be re-configured to DisplayPort
-	 * Configuration into the Safe state. For TYPEC_MUX_DOCK, the superspeed
-	 * signals can remain connected. For TYPEC_MUX_DP, disconnect the
-	 * superspeed signals here, before the pins are re-configured to
-	 * DisplayPort (in svdm_dp_post_config, when we receive the config ack).
+	 * Configuration into the Safe state. For USB_PD_MUX_DOCK, the
+	 * superspeed signals can remain connected. For USB_PD_MUX_DP_ENABLED,
+	 * disconnect the superspeed signals here, before the pins are
+	 * re-configured to DisplayPort (in svdm_dp_post_config, when we receive
+	 * the config ack).
 	 */
-	if (mux_mode == TYPEC_MUX_DP)
-		usb_mux_set(port, TYPEC_MUX_NONE, USB_SWITCH_CONNECT,
+	if (mux_mode == USB_PD_MUX_DP_ENABLED)
+		usb_mux_set(port, USB_PD_MUX_NONE, USB_SWITCH_CONNECT,
 			    pd_get_polarity(port));
 
 	payload[0] = VDO(USB_SID_DISPLAYPORT, 1,
diff --git a/baseboard/kukui/usb_pd_policy.c b/baseboard/kukui/usb_pd_policy.c
index 8ae257d16e..b88f85219e 100644
--- a/baseboard/kukui/usb_pd_policy.c
+++ b/baseboard/kukui/usb_pd_policy.c
@@ -102,7 +102,7 @@ __override void svdm_safe_dp_mode(int port)
 	/* make DP interface safe until configure */
 	dp_flags[port] = 0;
 	dp_status[port] = 0;
-	usb_mux_set(port, TYPEC_MUX_NONE,
+	usb_mux_set(port, USB_PD_MUX_NONE,
 		    USB_SWITCH_CONNECT, board_get_polarity(port));
 }
 
@@ -144,10 +144,11 @@ __override int svdm_dp_config(int port, uint32_t *payload)
 		return 0;
 
 	if (board_has_virtual_mux())
-		usb_mux_set(port, TYPEC_MUX_DP, USB_SWITCH_CONNECT,
+		usb_mux_set(port, USB_PD_MUX_DP_ENABLED, USB_SWITCH_CONNECT,
 			    board_get_polarity(port));
 	else
-		usb_mux_set(port, mf_pref ? TYPEC_MUX_DOCK : TYPEC_MUX_DP,
+		usb_mux_set(port, mf_pref ?
+			    USB_PD_MUX_DOCK : USB_PD_MUX_DP_ENABLED,
 			    USB_SWITCH_CONNECT, board_get_polarity(port));
 
 	payload[0] = VDO(USB_SID_DISPLAYPORT, 1,
diff --git a/baseboard/zork/baseboard.c b/baseboard/zork/baseboard.c
index b1c8662a07..3dcbd96560 100644
--- a/baseboard/zork/baseboard.c
+++ b/baseboard/zork/baseboard.c
@@ -473,7 +473,7 @@ void bc12_interrupt(enum gpio_signal signal)
 static int zork_c1_retimer_set_mux(int port, mux_state_t mux_state)
 {
 	return amd_fp5_usb_retimer.set(port,
-				       mux_state & ~MUX_POLARITY_INVERTED);
+				mux_state & ~USB_PD_MUX_POLARITY_INVERTED);
 }
 
 const struct usb_retimer_driver zork_c1_usb_retimer = {
@@ -569,7 +569,7 @@ static int zork_c1_set_mux(int port, mux_state_t mux_state)
 	 * Try to detect, give an error if we are setting to a
 	 * MUX value that is not NONE when we have no power.
 	 */
-	rv = zork_c1_detect(port, mux_state != TYPEC_MUX_NONE);
+	rv = zork_c1_detect(port, mux_state != USB_PD_MUX_NONE);
 	if (rv)
 		return rv;
 
@@ -596,7 +596,7 @@ static int zork_c1_get_mux(int port, mux_state_t *mux_state)
 		 * and make it a good status
 		 */
 		if (rv == EC_ERROR_NOT_POWERED) {
-			*mux_state = TYPEC_MUX_NONE;
+			*mux_state = USB_PD_MUX_NONE;
 			rv = EC_SUCCESS;
 		}
 		return rv;
diff --git a/baseboard/zork/usb_pd_policy.c b/baseboard/zork/usb_pd_policy.c
index aba5a40033..66433f9ac0 100644
--- a/baseboard/zork/usb_pd_policy.c
+++ b/baseboard/zork/usb_pd_policy.c
@@ -88,7 +88,7 @@ int board_vbus_source_enabled(int port)
 
 /* ----------------- Vendor Defined Messages ------------------ */
 #ifdef CONFIG_USB_PD_ALT_MODE_DFP
-static enum typec_mux svdm_dp_mux_mode(int port)
+mux_state_t svdm_dp_mux_mode(int port)
 {
 	int mf_pref = PD_VDO_DPSTS_MF_PREF(dp_status[port]);
 	int pin_mode = pd_dfp_dp_get_pin_mode(port, dp_status[port]);
@@ -97,9 +97,9 @@ static enum typec_mux svdm_dp_mux_mode(int port)
 	 * supported.
 	 */
 	if ((pin_mode & MODE_DP_PIN_MF_MASK) && mf_pref)
-		return TYPEC_MUX_DOCK;
+		return USB_PD_MUX_DOCK;
 	else
-		return TYPEC_MUX_DP;
+		return USB_PD_MUX_DP_ENABLED;
 }
 
 __override int svdm_dp_config(int port, uint32_t *payload)
@@ -107,7 +107,7 @@ __override 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]);
 	int pin_mode = pd_dfp_dp_get_pin_mode(port, dp_status[port]);
-	enum typec_mux mux_mode = svdm_dp_mux_mode(port);
+	mux_state_t mux_mode = svdm_dp_mux_mode(port);
 
 	if (!pin_mode)
 		return 0;
@@ -116,13 +116,14 @@ __override int svdm_dp_config(int port, uint32_t *payload)
 
 	/*
 	 * Place the USB Type-C pins that are to be re-configured to DisplayPort
-	 * Configuration into the Safe state. For TYPEC_MUX_DOCK, the superspeed
-	 * signals can remain connected. For TYPEC_MUX_DP, disconnect the
-	 * superspeed signals here, before the pins are re-configured to
-	 * DisplayPort (in svdm_dp_post_config, when we receive the config ack).
+	 * Configuration into the Safe state. For USB_PD_MUX_DOCK, the
+	 * superspeed signals can remain connected. For USB_PD_MUX_DP_ENABLED,
+	 * disconnect the superspeed signals here, before the pins are
+	 * re-configured to DisplayPort (in svdm_dp_post_config, when we receive
+	 * the config ack).
 	 */
-	if (mux_mode == TYPEC_MUX_DP)
-		usb_mux_set(port, TYPEC_MUX_NONE, USB_SWITCH_CONNECT,
+	if (mux_mode == USB_PD_MUX_DP_ENABLED)
+		usb_mux_set(port, USB_PD_MUX_NONE, USB_SWITCH_CONNECT,
 			    pd_get_polarity(port));
 
 	payload[0] = VDO(USB_SID_DISPLAYPORT, 1,
@@ -162,7 +163,7 @@ __override void svdm_exit_dp_mode(int port)
 	dp_flags[port] = 0;
 	dp_status[port] = 0;
 
-	usb_mux_set(port, TYPEC_MUX_NONE, USB_SWITCH_CONNECT,
+	usb_mux_set(port, USB_PD_MUX_NONE, USB_SWITCH_CONNECT,
 		    pd_get_polarity(port));
 	gpio_set_level(PORT_TO_HPD(port), 0);