Drop usb-phy-generic-get-the-vbus-supply.patch from older trees

diff --git a/queue-4.19/series b/queue-4.19/series
index 3f7848c3a18bb04e19626093ddb7c741a18a375b..f3ae7328e6cfb8f122669fed8c3c6887a974487a 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -129,7 +129,6 @@ scsi-bfa-fix-function-pointer-type-mismatch-for-hcb_.patch
 net-sunrpc-fix-an-off-by-one-in-rpc_sockaddr2uaddr.patch
 nfs-fix-an-off-by-one-in-root_nfs_cat.patch
 clk-qcom-gdsc-add-support-to-update-gdsc-transition-.patch
-usb-phy-generic-get-the-vbus-supply.patch
 serial-max310x-fix-syntax-error-in-irq-error-message.patch
 tty-serial-samsung-fix-tx_empty-to-return-tiocser_te.patch
 kconfig-fix-infinite-loop-when-expanding-a-macro-at-.patch

diff --git a/queue-4.19/usb-phy-generic-get-the-vbus-supply.patch b/queue-4.19/usb-phy-generic-get-the-vbus-supply.patch
deleted file mode 100644 (file)
index f2c1632..0000000
--- a/queue-4.19/usb-phy-generic-get-the-vbus-supply.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 506472a209a7a1d611415b39a853973d0f81b8d0 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
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 4f44d13e6dfc17979dad54c43b071256a141e1f9..cf6cfa88fabc733c4ba4718fd589a33013522b44 100644 (file)
--- 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 (file)
index ab928e5..0000000
--- 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
-