Merge "usb: dwc3-msm: Get usb power_supply from device tree"

This commit is contained in:
qctecmdr 2019-10-31 15:32:41 -07:00 • committed by Gerrit - the friendly Code Review server
commit bba34cd529

View file

@ -4537,11 +4537,14 @@ static int dwc3_msm_gadget_vbus_draw(struct dwc3_msm *mdwc, unsigned int mA)
int ret;
if (!mdwc->usb_psy) {
mdwc->usb_psy = power_supply_get_by_name("usb");
if (!mdwc->usb_psy) {
dev_err(mdwc->dev, "Could not get usb psy\n");
mdwc->usb_psy = power_supply_get_by_phandle(mdwc->dev->of_node,
"qcom,usb-charger");
if (IS_ERR_OR_NULL(mdwc->usb_psy)) {
dev_info(mdwc->dev, "Could not get usb psy\n");
return -ENODEV;
}
} else if (IS_ERR(mdwc->usb_psy)) {
return 0;
}
if (mdwc->max_power == mA)