]> xenbits.xensource.com Git - people/aperard/linux.git/commitdiff
usb: phy: generic: Get the vbus supply
authorSean Anderson <sean.anderson@seco.com>
Tue, 23 Jan 2024 22:51:09 +0000 (17:51 -0500)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:20:57 +0000 (18:20 -0400)
[ Upstream commit 75fd6485cccef269ac9eb3b71cf56753341195ef ]

While support for working with a vbus was added, the regulator was never
actually gotten (despite what was documented). Fix this by actually
getting the supply from the device tree.

Fixes: 7acc9973e3c4 ("usb: phy: generic: add vbus support")
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Link: https://lore.kernel.org/r/20240123225111.1629405-3-sean.anderson@seco.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/usb/phy/phy-generic.c

index 3dc5c04e7cbf91bedf49d6387d609c6239d76ee0..953df04b40d40e22a9955c766d4f26c9a850912e 100644 (file)
@@ -265,6 +265,13 @@ int usb_phy_gen_create_phy(struct device *dev, struct usb_phy_generic *nop)
                        return -EPROBE_DEFER;
        }
 
+       nop->vbus_draw = devm_regulator_get_exclusive(dev, "vbus");
+       if (PTR_ERR(nop->vbus_draw) == -ENODEV)
+               nop->vbus_draw = NULL;
+       if (IS_ERR(nop->vbus_draw))
+               return dev_err_probe(dev, PTR_ERR(nop->vbus_draw),
+                                    "could not get vbus regulator\n");
+
        nop->vbus_draw = devm_regulator_get_exclusive(dev, "vbus");
        if (PTR_ERR(nop->vbus_draw) == -ENODEV)
                nop->vbus_draw = NULL;