kernel: refresh kernel configs with kconfig.pl

[openwrt.git] / target / linux / generic / patches-3.6 / 811-pci_disable_usb_common_quirks.patch

diff --git a/target/linux/generic/patches-3.6/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.6/811-pci_disable_usb_common_quirks.patch
index 7bf8eaf..271e53d 100644 (file)
--- a/target/linux/generic/patches-3.6/811-pci_disable_usb_common_quirks.patch
+++ b/target/linux/generic/patches-3.6/811-pci_disable_usb_common_quirks.patch
@@ -1,38 +1,79 @@
 
 --- a/drivers/usb/host/pci-quirks.c
 +++ b/drivers/usb/host/pci-quirks.c
-@@ -432,6 +432,8 @@ reset_needed:
+@@ -79,6 +79,8 @@
+ #define USB_INTEL_USB3_PSSEN   0xD8
+ #define USB_INTEL_USB3PRM      0xDC
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
++
+ static struct amd_chipset_info {
+       struct pci_dev  *nb_dev;
+       struct pci_dev  *smbus_dev;
+@@ -353,6 +355,10 @@ void usb_amd_dev_put(void)
+ }
+ EXPORT_SYMBOL_GPL(usb_amd_dev_put);
+ 
++#endif /* CONFIG_PCI_DISABLE_COMMON_QUIRKS */
++
++#if IS_ENABLED(CONFIG_USB_UHCI_HCD)
++
+ /*
+  * Make sure the controller is completely inactive, unable to
+  * generate interrupts or do DMA.
+@@ -432,8 +438,16 @@ reset_needed:
+       uhci_reset_hc(pdev, base);
+       return 1;
  }
++#else
++int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base)
++{
++      return 0;
++}
++
++#endif
  EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
  
 +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
-+
  static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
  {
        u16 cmd;
-@@ -928,3 +930,5 @@ static void __devinit quirk_usb_early_ha
-       pci_disable_device(pdev);
+@@ -971,3 +985,4 @@ static void __devinit quirk_usb_early_ha
  }
- DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
-+
+ DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
+                       PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
 +#endif
 --- a/drivers/usb/host/pci-quirks.h
 +++ b/drivers/usb/host/pci-quirks.h
-@@ -8,9 +8,17 @@ int usb_amd_find_chipset_info(void);
+@@ -4,18 +4,26 @@
+ #ifdef CONFIG_PCI
+ void uhci_reset_hc(struct pci_dev *pdev, unsigned long base);
+ int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base);
++bool usb_is_intel_switchable_xhci(struct pci_dev *pdev);
++void usb_enable_xhci_ports(struct pci_dev *xhci_pdev);
++void usb_disable_xhci_ports(struct pci_dev *xhci_pdev);
++#else
++static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {}
++#endif  /* CONFIG_PCI */
++
++#if defined(CONFIG_PCI) && !defined(CONFIG_PCI_DISABLE_COMMON_QUIRKS)
+ int usb_amd_find_chipset_info(void);
  void usb_amd_dev_put(void);
  void usb_amd_quirk_pll_disable(void);
  void usb_amd_quirk_pll_enable(void);
-+#if !defined(CONFIG_PCI_DISABLE_COMMON_QUIRKS)
- bool usb_is_intel_switchable_xhci(struct pci_dev *pdev);
- void usb_enable_xhci_ports(struct pci_dev *xhci_pdev);
+-bool usb_is_intel_switchable_xhci(struct pci_dev *pdev);
+-void usb_enable_xhci_ports(struct pci_dev *xhci_pdev);
+-void usb_disable_xhci_ports(struct pci_dev *xhci_pdev);
  #else
-+static inline bool usb_is_intel_switchable_xhci(struct pci_dev *pdev)
++static inline int usb_amd_find_chipset_info(void)
 +{
-+      return false;
++      return 0;
 +}
-+static inline void usb_enable_xhci_ports(struct pci_dev *xhci_pdev) {}
-+#endif
-+#else
  static inline void usb_amd_quirk_pll_disable(void) {}
  static inline void usb_amd_quirk_pll_enable(void) {}
  static inline void usb_amd_dev_put(void) {}
+-static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {}
+-#endif  /* CONFIG_PCI */
++#endif
+ 
+ #endif  /*  __LINUX_USB_PCI_QUIRKS_H  */