random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-13 12:26:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch/musb-charging' into allwinner

Browse Source 
# Conflicts:
#	drivers/phy/allwinner/phy-sun4i-usb.c
This commit is contained in:
Samuel Holland 2022-10-31 22:44:16 -05:00
commit 108af9101a
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/phy/allwinner/phy-sun4i-usb.c
View File

@ -198,6 +198,12 @@ static int sun4i_usb_phy_power_on(struct phy *phy)
initial_usb_scan_delay = 0;
}
/* For phy0 only turn on Vbus if we don't have an ext. Vbus */
if (phy->id == 0 && sun4i_usb_phy_vbus_detect(phy)) {
dev_warn(phy->dev, "External vbus detected, not enabling our own vbus\n");
return 0;
}
if (usb_phy->vbus) {
ret = regulator_set_enable(usb_phy->vbus, true);
if (ret && ret != -ENOSYS)