remove some 3.0 patches that broke the build

diff --git a/queue-3.0/series b/queue-3.0/series
index 87fad718b90ca2c7f446185ac94f6347775670e2..fd77ac0bf2bce97046489b74f081dcaf186cb2b3 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -37,11 +37,9 @@ usb-serial-ti_usb_3410_5052-add-support-for-the-fri2-serial-console.patch
 usb-gadget-fsl_udc_core-dtd-s-next-dtd-pointer-need-to-be-updated-once-written.patch
 usb-add-usb_quirk_reset_resume-for-m-audio-88es.patch
 xhci-add-lynx-point-to-list-of-intel-switchable-hosts.patch
-xhci-avoid-dead-ports-when-config_usb_xhci_hcd-n.patch
 usb-xhci-handle-comp_tx_err-for-isoc-tds.patch
 xhci-reset-reserved-command-ring-trbs-on-cleanup.patch
 xhci-add-new-short-tx-quirk-for-fresco-logic-host.patch
-usbcore-enable-usb2-lpm-if-port-suspend-fails.patch
 drm-i915-avoid-a-double-read-of-pch_iir-during-interrupt-handling.patch
 drm-i915-use-hw-scheduler-for-fixed-function-shaders.patch
 drm-i915-don-t-clobber-the-pipe-param-in-sanitize_modesetting.patch

diff --git a/queue-3.0/usbcore-enable-usb2-lpm-if-port-suspend-fails.patch b/queue-3.0/usbcore-enable-usb2-lpm-if-port-suspend-fails.patch
deleted file mode 100644 (file)
index e16320c..0000000
--- a/queue-3.0/usbcore-enable-usb2-lpm-if-port-suspend-fails.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From c3e751e4f4754793bb52bd5ae30e9cc027edbb12 Mon Sep 17 00:00:00 2001
-From: Andiry Xu <andiry.xu@gmail.com>
-Date: Sat, 5 May 2012 00:50:10 +0800
-Subject: usbcore: enable USB2 LPM if port suspend fails
-
-From: Andiry Xu <andiry.xu@gmail.com>
-
-commit c3e751e4f4754793bb52bd5ae30e9cc027edbb12 upstream.
-
-USB2 LPM is disabled when device begin to suspend and enabled after device
-is resumed. That's because USB spec does not define the transition from
-U1/U2 state to U3 state.
-
-If usb_port_suspend() fails, usb_port_resume() is never called, and USB2 LPM
-is disabled in this situation. Enable USB2 LPM if port suspend fails.
-
-This patch should be backported to kernels as old as 3.2, that contain
-the commit 65580b4321eb36f16ae8b5987bfa1bb948fc5112 "xHCI: set USB2
-hardware LPM".
-
-Signed-off-by: Andiry Xu <andiry.xu@gmail.com>
-Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/core/hub.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/usb/core/hub.c
-+++ b/drivers/usb/core/hub.c
-@@ -2373,6 +2373,10 @@ int usb_port_suspend(struct usb_device *
-                               NULL, 0,
-                               USB_CTRL_SET_TIMEOUT);
- 
-+              /* Try to enable USB2 hardware LPM again */
-+              if (udev->usb2_hw_lpm_capable == 1)
-+                      usb_set_usb2_hardware_lpm(udev, 1);
-+
-               /* System sleep transitions should never fail */
-               if (!(msg.event & PM_EVENT_AUTO))
-                       status = 0;

diff --git a/queue-3.0/xhci-avoid-dead-ports-when-config_usb_xhci_hcd-n.patch b/queue-3.0/xhci-avoid-dead-ports-when-config_usb_xhci_hcd-n.patch
deleted file mode 100644 (file)
index 47b4047..0000000
--- a/queue-3.0/xhci-avoid-dead-ports-when-config_usb_xhci_hcd-n.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 51c9e6c7732b67769c0a514d31f505e49fa82dd4 Mon Sep 17 00:00:00 2001
-From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
-Date: Mon, 16 Apr 2012 10:56:47 -0700
-Subject: xhci: Avoid dead ports when CONFIG_USB_XHCI_HCD=n
-
-From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
-
-commit 51c9e6c7732b67769c0a514d31f505e49fa82dd4 upstream.
-
-If the user chooses to say "no" to CONFIG_USB_XHCI_HCD on a system
-with an Intel Panther Point chipset, the PCI quirks code or the EHCI
-driver will switch the ports over to the xHCI host, but the xHCI driver
-will never load.  The ports will be powered off and seem "dead" to the
-user.
-
-Fix this by only switching the ports over if CONFIG_USB_XHCI_HCD is
-either compiled in, or compiled as a module.
-
-This patch should be backported to stable kernels as old as 3.0,
-that contain commit 69e848c2090aebba5698a1620604c7dccb448684
-"Intel xhci: Support EHCI/xHCI port switching."
-
-Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
-Reported-by: Eric Anholt <eric.anholt@intel.com>
-Reported-by: David Bein <d.bein@f5.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/host/pci-quirks.c |   14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
---- a/drivers/usb/host/pci-quirks.c
-+++ b/drivers/usb/host/pci-quirks.c
-@@ -9,6 +9,7 @@
-  */
- 
- #include <linux/types.h>
-+#include <linux/kconfig.h>
- #include <linux/kernel.h>
- #include <linux/pci.h>
- #include <linux/init.h>
-@@ -757,6 +758,19 @@ void usb_enable_xhci_ports(struct pci_de
- {
-       u32             ports_available;
- 
-+      /* Don't switchover the ports if the user hasn't compiled the xHCI
-+       * driver.  Otherwise they will see "dead" USB ports that don't power
-+       * the devices.
-+       */
-+      if (!IS_ENABLED(CONFIG_USB_XHCI_HCD)) {
-+              dev_warn(&xhci_pdev->dev,
-+                              "CONFIG_USB_XHCI_HCD is turned off, "
-+                              "defaulting to EHCI.\n");
-+              dev_warn(&xhci_pdev->dev,
-+                              "USB 3.0 devices will work at USB 2.0 speeds.\n");
-+              return;
-+      }
-+
-       ports_available = 0xffffffff;
-       /* Write USB3_PSSEN, the USB 3.0 Port SuperSpeed Enable
-        * Register, to turn on SuperSpeed terminations for all