Merge "usb: dwc3-msm: Ignore multiple VBUS notifications" (8adf5978) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/dwc3/dwc3-msm.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -2301,6 +2301,9 @@ static int dwc3_msm_power_set_property_usb(struct power_supply *psy,
		dev_dbg(mdwc->dev, "%s: notify xceiv event\n", __func__);
		if (mdwc->otg_xceiv && !mdwc->ext_inuse &&
		(mdwc->ext_xceiv.otg_capability \|\| !init)) {
		if (mdwc->ext_xceiv.bsv == val->intval)
		break;

		mdwc->ext_xceiv.bsv = val->intval;
		/*
		* Set debouncing delay to 120ms. Otherwise battery

+17 −13

Original line number	Diff line number	Diff line
		@@ -364,8 +364,9 @@ static void dwc3_ext_event_notify(struct usb_otg *otg,
		flush_delayed_work(&dotg->sm_work);

		if (event == DWC3_EVENT_PHY_RESUME) {
		if (!pm_runtime_status_suspended(phy->dev))
		dev_warn(phy->dev, "PHY_RESUME event out of LPM!!!!\n");
		if (pm_runtime_status_suspended(phy->dev) \|\|
		atomic_read(&phy->dev->power.usage_count) == 0) {

		dev_dbg(phy->dev, "ext PHY_RESUME event received\n");
		/* ext_xceiver would have taken h/w out of LPM by now */
		ret = pm_runtime_get(phy->dev);
		@@ -379,6 +380,9 @@ static void dwc3_ext_event_notify(struct usb_otg *otg,
		} else if (ret < 0) {
		dev_warn(phy->dev, "pm_runtime_get failed!\n");
		}
		} else {
		dev_warn(phy->dev, "PHY_RESUME event out of LPM!!!!\n");
		}
		} else if (event == DWC3_EVENT_XCEIV_STATE) {
		if (pm_runtime_status_suspended(phy->dev) \|\|
		atomic_read(&phy->dev->power.usage_count) == 0) {