usbc: Enable VBUS measurement before VBUS check level

Enable VBUS measurement before checking the VBUS level and
disable it when unattached.

Signed-off-by: Jianxiong Gu <[email protected]>

Author: recalci

subsys/usb/usb_c/usbc_pe_snk_states.c

@@ -106,7 +106,14 @@ void pe_snk_startup_run(void *obj)
  */
 void pe_snk_discovery_entry(void *obj)
 {
+	struct policy_engine *pe = (struct policy_engine *)obj;
+	const struct device *dev = pe->dev;
+	struct usbc_port_data *data = dev->data;
+	const struct device *vbus = data->vbus;
+
 	LOG_INF("PE_SNK_Discovery");
+
+	usbc_vbus_enable(vbus, true);
 }
 
 /**

subsys/usb/usb_c/usbc_tc_snk_states.c

@@ -98,12 +98,15 @@ void tc_unattached_snk_run(void *obj)
 {
 	struct tc_sm_t *tc = (struct tc_sm_t *)obj;
 	const struct device *dev = tc->dev;
+	struct usbc_port_data *data = dev->data;
+	const struct device *vbus = data->vbus;
 
 	/*
 	 * Transition to AttachWait.SNK when the SNK.Rp state is present
 	 * on at least one of its CC pins.
 	 */
 	if (tcpc_is_cc_rp(tc->cc1) || tcpc_is_cc_rp(tc->cc2)) {
+		usbc_vbus_enable(vbus, true);
 		tc_set_state(dev, TC_ATTACH_WAIT_SNK_STATE);
 	}
 }
@@ -240,6 +243,7 @@ void tc_attached_snk_run(void *obj)
 
 	/* Detach detection */
 	if (usbc_vbus_check_level(vbus, TC_VBUS_PRESENT) == false) {
+		usbc_vbus_enable(vbus, false);
 		tc_set_state(dev, TC_UNATTACHED_SNK_STATE);
 		return;
 	}

subsys/usb/usb_c/usbc_tc_src_states.c

@@ -122,11 +122,16 @@ void tc_unattached_wait_src_exit(void *obj)
 void tc_attach_wait_src_entry(void *obj)
 {
 	struct tc_sm_t *tc = (struct tc_sm_t *)obj;
+	const struct device *dev = tc->dev;
+	struct usbc_port_data *data = dev->data;
+	const struct device *vbus = data->vbus;
 
 	LOG_INF("AttachWait.SRC");
 
 	/* Initialize the cc state to open */
 	tc->cc_state = TC_CC_NONE;
+
+	usbc_vbus_enable(vbus, true);
 }
 
 void tc_attach_wait_src_run(void *obj)