Merge "dwc3-msm: Replace autosuspend delay functionality with stop host mode"

This commit is contained in:
Linux Build Service Account 2019-09-23 08:39:05 -07:00 committed by Gerrit - the friendly Code Review server
commit d448d5bf1a

View file

@ -2229,7 +2229,7 @@ static int dwc3_msm_suspend(struct dwc3_msm *mdwc, bool hibernation)
/* kick_sm if it is waiting for lpm sequence to finish */
if (test_and_clear_bit(WAIT_FOR_LPM, &mdwc->inputs))
schedule_delayed_work(&mdwc->sm_work, 0);
queue_delayed_work(mdwc->sm_usb_wq, &mdwc->sm_work, 0);
mutex_unlock(&mdwc->suspend_resume_mutex);
@ -3748,8 +3748,7 @@ static int dwc3_otg_start_host(struct dwc3_msm *mdwc, int on)
/* wait for LPM, to ensure h/w is reset after stop_host */
set_bit(WAIT_FOR_LPM, &mdwc->inputs);
pm_runtime_mark_last_busy(mdwc->dev);
pm_runtime_put_sync_autosuspend(mdwc->dev);
pm_runtime_put_sync_suspend(mdwc->dev);
dbg_event(0xFF, "StopHost psync",
atomic_read(&mdwc->dev->power.usage_count));
}