drop 4.9 musb patch

diff --git a/queue-4.9/series b/queue-4.9/series
index ff1dd443b3cf2d25b6bd0e84a1905a7e2f4386f8..e4ed3a2f3bff7e5be3938eeaf4bf286c94052c21 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -25,7 +25,6 @@ pinctrl-rockchip-fix-restore-error-in-resume.patch
 extcon-fix-error-handling-in-extcon_dev_register.patch
 firewire-nosy-fix-a-use-after-free-bug-in-nosy_ioctl.patch
 usb-quirks-ignore-remote-wake-up-on-fibocom-l850-gl-lte-modem.patch
-usb-musb-fix-suspend-with-devices-connected-for-a64.patch
 usb-xhci-mtk-fix-broken-streams-issue-on-0.96-xhci.patch
 cdc-acm-fix-break-rx-code-path-adding-necessary-calls.patch
 usb-cdc-acm-downgrade-message-to-debug.patch

diff --git a/queue-4.9/usb-musb-fix-suspend-with-devices-connected-for-a64.patch b/queue-4.9/usb-musb-fix-suspend-with-devices-connected-for-a64.patch
deleted file mode 100644 (file)
index 6d79355..0000000
--- a/queue-4.9/usb-musb-fix-suspend-with-devices-connected-for-a64.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 92af4fc6ec331228aca322ca37c8aea7b150a151 Mon Sep 17 00:00:00 2001
-From: Tony Lindgren <tony@atomide.com>
-Date: Wed, 24 Mar 2021 09:11:41 +0200
-Subject: usb: musb: Fix suspend with devices connected for a64
-
-From: Tony Lindgren <tony@atomide.com>
-
-commit 92af4fc6ec331228aca322ca37c8aea7b150a151 upstream.
-
-Pinephone running on Allwinner A64 fails to suspend with USB devices
-connected as reported by Bhushan Shah <bshah@kde.org>. Reverting
-commit 5fbf7a253470 ("usb: musb: fix idling for suspend after
-disconnect interrupt") fixes the issue.
-
-Let's add suspend checks also for suspend after disconnect interrupt
-quirk handling like we already do elsewhere.
-
-Fixes: 5fbf7a253470 ("usb: musb: fix idling for suspend after disconnect interrupt")
-Reported-by: Bhushan Shah <bshah@kde.org>
-Tested-by: Bhushan Shah <bshah@kde.org>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Link: https://lore.kernel.org/r/20210324071142.42264-1-tony@atomide.com
-Cc: stable <stable@vger.kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/usb/musb/musb_core.c |   12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
---- a/drivers/usb/musb/musb_core.c
-+++ b/drivers/usb/musb/musb_core.c
-@@ -1858,10 +1858,14 @@ static void musb_pm_runtime_check_sessio
-               MUSB_DEVCTL_HR;
-       switch (devctl & ~s) {
-       case MUSB_QUIRK_B_DISCONNECT_99:
--              musb_dbg(musb, "Poll devctl in case of suspend after disconnect\n");
--              schedule_delayed_work(&musb->irq_work,
--                                    msecs_to_jiffies(1000));
--              break;
-+              if (musb->quirk_retries && !musb->flush_irq_work) {
-+                      musb_dbg(musb, "Poll devctl in case of suspend after disconnect\n");
-+                      schedule_delayed_work(&musb->irq_work,
-+                                            msecs_to_jiffies(1000));
-+                      musb->quirk_retries--;
-+                      break;
-+              }
-+              /* fall through */
-       case MUSB_QUIRK_B_INVALID_VBUS_91:
-               if (musb->quirk_retries--) {
-                       musb_dbg(musb,