diff options
| author | Sasha Levin <sashal@kernel.org> | 2024-03-25 07:28:19 -0400 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2024-03-25 07:28:19 -0400 |
| commit | 6daf3d092c4983ae001b4391a55f0e86756908ac (patch) | |
| tree | b623dfb9a3739b30b00b4060f71b80f317881b4f /queue-5.4 | |
| parent | 22282cbed13c65a64ae24eacc4eb0782e8003b1e (diff) | |
| download | stable-queue-6daf3d092c4983ae001b4391a55f0e86756908ac.tar.gz | |
Drop usb-phy-generic-get-the-vbus-supply.patch from older trees
Diffstat (limited to 'queue-5.4')
| -rw-r--r-- | queue-5.4/series | 1 | ||||
| -rw-r--r-- | queue-5.4/usb-phy-generic-get-the-vbus-supply.patch | 44 |
2 files changed, 0 insertions, 45 deletions
diff --git a/queue-5.4/series b/queue-5.4/series index 4f44d13e6d..cf6cfa88fa 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -155,7 +155,6 @@ net-sunrpc-fix-an-off-by-one-in-rpc_sockaddr2uaddr.patch watchdog-stm32_iwdg-initialize-default-timeout.patch nfs-fix-an-off-by-one-in-root_nfs_cat.patch afs-revert-afs-hide-silly-rename-files-from-userspac.patch -usb-phy-generic-get-the-vbus-supply.patch tty-vt-fix-20-vs-0x20-typo-in-escsiignore.patch serial-max310x-fix-syntax-error-in-irq-error-message.patch tty-serial-samsung-fix-tx_empty-to-return-tiocser_te.patch diff --git a/queue-5.4/usb-phy-generic-get-the-vbus-supply.patch b/queue-5.4/usb-phy-generic-get-the-vbus-supply.patch deleted file mode 100644 index ab928e505d..0000000000 --- a/queue-5.4/usb-phy-generic-get-the-vbus-supply.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 8b953b1a5ea098afcee9bc250fe248f4053ed7ac Mon Sep 17 00:00:00 2001 -From: Sasha Levin <sashal@kernel.org> -Date: Mon, 25 Apr 2022 13:14:09 -0400 -Subject: usb: phy: generic: Get the vbus supply - -From: Sean Anderson <sean.anderson@seco.com> - -[ Upstream commit 03e607cbb2931374db1825f371e9c7f28526d3f4 ] - -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") -Cc: stable <stable@kernel.org> -Signed-off-by: Sean Anderson <sean.anderson@seco.com> -Link: https://lore.kernel.org/r/20220425171412.1188485-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 | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/drivers/usb/phy/phy-generic.c b/drivers/usb/phy/phy-generic.c -index a53b89be53248..8a04b157f19f3 100644 ---- a/drivers/usb/phy/phy-generic.c -+++ b/drivers/usb/phy/phy-generic.c -@@ -283,6 +283,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->dev = dev; - nop->phy.dev = nop->dev; - nop->phy.label = "nop-xceiv"; --- -2.43.0 - |