Merge "USB: pd: Send PS_RDY within tNewSrc after PS_RDY received" (1bef9fca) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/usb/pd/policy_engine.c

+16 −1

Original line number	Diff line number	Diff line
		@@ -1929,6 +1929,22 @@ static int enable_vbus(struct usbpd *pd)
		else
		pd->vbus_enabled = true;

		count = 10;
		/*
		* Check to make sure VBUS voltage reaches above Vsafe5Vmin (4.75v)
		* before proceeding.
		*/
		while (count--) {
		ret = power_supply_get_property(pd->usb_psy,
		POWER_SUPPLY_PROP_VOLTAGE_NOW, &val);
		if (ret \|\| val.intval >= 4750000) /vsafe5Vmin/
		break;
		usleep_range(10000, 12000); /* Delay between two reads */
		}

		if (ret)
		msleep(100); /* Delay to wait for VBUS ramp up if read fails */

		return ret;
		}

		@@ -2843,7 +2859,6 @@ static void usbpd_sm(struct work_struct *w)

		case PE_PRS_SNK_SRC_SOURCE_ON:
		enable_vbus(pd);
		msleep(200); /* allow time VBUS ramp-up, must be < tNewSrc */

		ret = pd_send_msg(pd, MSG_PS_RDY, NULL, 0, SOP_MSG);
		if (ret) {