diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-03-14 14:45:56 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-03-14 14:45:56 +0000 |
| commit | 05ea13b746e715f03c70e29068b650a62e5e5d79 (patch) | |
| tree | 08d6be7813310be182259388518215a17afcc18c /target/linux/generic/patches-3.9/811-pci_disable_usb_common_quirks.patch | |
| parent | 54d0b82f17bde2e67b8a2b58c1cb3e9ba294e9b7 (diff) | |
kernel: add support for 3.9-rc2
Signed-off-by: Florian Fainelli <florian@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36008 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.9/811-pci_disable_usb_common_quirks.patch')
| -rw-r--r-- | target/linux/generic/patches-3.9/811-pci_disable_usb_common_quirks.patch | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.9/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.9/811-pci_disable_usb_common_quirks.patch new file mode 100644 index 000000000..1486e0df4 --- /dev/null +++ b/target/linux/generic/patches-3.9/811-pci_disable_usb_common_quirks.patch @@ -0,0 +1,80 @@ + +--- a/drivers/usb/host/pci-quirks.c ++++ b/drivers/usb/host/pci-quirks.c +@@ -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,17 @@ 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; +@@ -974,3 +989,4 @@ static void quirk_usb_early_handoff(stru + } + 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 +@@ -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); +-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 int usb_amd_find_chipset_info(void) ++{ ++ return 0; ++} + 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 */ |