Revert "usb: dwc3: Handle charging behavior when usb data is disabled"
This reverts commit f60138b6bc.
Reason for revert: Conflicts with upstream changes.
Change-Id: Ic376c5d1b2fe9e5ae961c1114375ffbc3ae781f3
This commit is contained in:
parent
7a0d694b18
commit
5c0c40f028
1 changed files with 2 additions and 8 deletions
|
|
@ -4090,13 +4090,8 @@ static int dwc3_msm_vbus_notifier(struct notifier_block *nb,
|
|||
if (!edev || !mdwc)
|
||||
return NOTIFY_DONE;
|
||||
|
||||
if (!mdwc->usb_data_enabled) {
|
||||
if (event)
|
||||
dwc3_msm_gadget_vbus_draw(mdwc, 500);
|
||||
else
|
||||
dwc3_msm_gadget_vbus_draw(mdwc, 0);
|
||||
if (!mdwc->usb_data_enabled)
|
||||
return NOTIFY_DONE;
|
||||
}
|
||||
|
||||
dwc = platform_get_drvdata(mdwc->dwc3);
|
||||
|
||||
|
|
@ -5839,8 +5834,7 @@ static void dwc3_otg_sm_work(struct work_struct *w)
|
|||
mdwc->drd_state = DRD_STATE_PERIPHERAL;
|
||||
work = true;
|
||||
} else {
|
||||
if (mdwc->usb_data_enabled)
|
||||
dwc3_msm_gadget_vbus_draw(mdwc, 0);
|
||||
dwc3_msm_gadget_vbus_draw(mdwc, 0);
|
||||
dev_dbg(mdwc->dev, "Cable disconnected\n");
|
||||
}
|
||||
break;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue