diff options
| author | Tom Rini <trini@konsulko.com> | 2023-04-30 21:29:50 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-04-30 21:29:50 -0400 |
| commit | 27dc8826441f0c5dd6aa6617a32909d9049f1202 (patch) | |
| tree | 18a2dcc2249614fe95b52983a5abe5e992d74840 /drivers/phy | |
| parent | fe3a77cb157a6210d8036845f5f80ea67c183563 (diff) | |
| parent | 25bc7bfc30532098d9207783ff2ca45cdc5a0161 (diff) | |
| download | u-boot-WIP/30Apr2023.zip u-boot-WIP/30Apr2023.tar.gz u-boot-WIP/30Apr2023.tar.bz2 | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxiWIP/30Apr2023
Please pull the second part of the sunxi pull request for this cycle.
Another bunch of patches that replace old-school U-Boot hacks with
proper DM based code, this time for the raw NAND flash driver, and the
USB PHY VBUS detection code. Plus two smaller patches that were sitting
in my inbox for a while.
Gitlab CI passed. In lack of some supported board with NAND flash I
couldn't really test this part, but apparently this was tested by the
reviewer. I briefly ran the branch on some boards with USB-OTG, and
this still worked.
Diffstat (limited to 'drivers/phy')
| -rw-r--r-- | drivers/phy/allwinner/phy-sun4i-usb.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c index 2e969ab..6428163 100644 --- a/drivers/phy/allwinner/phy-sun4i-usb.c +++ b/drivers/phy/allwinner/phy-sun4i-usb.c @@ -224,6 +224,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 (dm_gpio_is_valid(&usb_phy->gpio_vbus)) dm_gpio_set_value(&usb_phy->gpio_vbus, 1); |