Merge "USB: policy_engine: Enable VBUS after VCONN before PE_SRC_Startup"

diff --combined drivers/usb/pd/policy_engine.c
index 3f1c2b3,48f7d75..0cbe953
--- 1/drivers/usb/pd/policy_engine.c
--- 2/drivers/usb/pd/policy_engine.c
+++ b/drivers/usb/pd/policy_engine.c
@@@ -182,7 -182,7 +182,7 @@@ static void *usbpd_ipc_log
  #define PS_HARD_RESET_TIME    25
  #define PS_SOURCE_ON          400
  #define PS_SOURCE_OFF         750
 -#define SWAP_SOURCE_START_TIME        20
 +#define FIRST_SOURCE_CAP_TIME 200
  #define VDM_BUSY_TIME         50
  #define VCONN_ON_TIME         100
  
@@@ -790,27 -790,17 +790,27 @@@ static void usbpd_set_state(struct usbp
                        pd->pd_phy_opened = true;
                }
  
 -              pd->current_state = PE_SRC_SEND_CAPABILITIES;
                if (pd->in_pr_swap) {
 -                      kick_sm(pd, SWAP_SOURCE_START_TIME);
                        pd->in_pr_swap = false;
                        val.intval = 0;
                        power_supply_set_property(pd->usb_psy,
                                        POWER_SUPPLY_PROP_PR_SWAP, &val);
 -                      break;
                }
  
 -              /* fall-through */
 +              /*
 +               * A sink might remove its terminations (during some Type-C
 +               * compliance tests or a sink attempting to do Try.SRC)
 +               * at this point just after we enabled VBUS. Sending PD
 +               * messages now would delay detecting the detach beyond the
 +               * required timing. Instead, delay sending out the first
 +               * source capabilities to allow for the other side to
 +               * completely settle CC debounce and allow HW to detect detach
 +               * sooner in the meantime. PD spec allows up to
 +               * tFirstSourceCap (250ms).
 +               */
 +              pd->current_state = PE_SRC_SEND_CAPABILITIES;
 +              kick_sm(pd, FIRST_SOURCE_CAP_TIME);
 +              break;
  
        case PE_SRC_SEND_CAPABILITIES:
                kick_sm(pd, 0);
@@@ -920,7 -910,6 +920,7 @@@
  
                        if (pd->psy_type == POWER_SUPPLY_TYPE_USB ||
                                pd->psy_type == POWER_SUPPLY_TYPE_USB_CDP ||
 +                              pd->psy_type == POWER_SUPPLY_TYPE_USB_FLOAT ||
                                usb_compliance_mode)
                                start_usb_peripheral(pd);
                }
@@@ -1702,7 -1691,6 +1702,6 @@@ static void usbpd_sm(struct work_struc
                if (pd->current_pr == PR_SINK) {
                        usbpd_set_state(pd, PE_SNK_STARTUP);
                } else if (pd->current_pr == PR_SRC) {
-                       enable_vbus(pd);
                        if (!pd->vconn_enabled &&
                                        pd->typec_mode ==
                                        POWER_SUPPLY_TYPEC_SINK_POWERED_CABLE) {
@@@ -1712,6 -1700,7 +1711,7 @@@
                                else
                                        pd->vconn_enabled = true;
                        }
+                       enable_vbus(pd);
  
                        usbpd_set_state(pd, PE_SRC_STARTUP);
                }