diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-16 13:05:06 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-16 13:05:06 -0500 |
commit | 36facadd9ea98f8415d0dbb63e0763b7ee9d3911 (patch) | |
tree | 99dea00b332ed852f2b0a4923b581dd723f03634 /drivers/usb/host/ehci-hcd.c | |
parent | 2faa83e2a519abea1055d156ce1b42b8fa57e87b (diff) | |
parent | 0b83ae960cd7d4a5ee02786ecf41ab45688999bf (diff) |
Merge branch 'usb-next' into musb-merge
* usb-next: (132 commits)
USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path
USB: uas: Ensure we only bind to a UAS interface
USB: uas: Rename sense pipe and sense urb to status pipe and status urb
USB: uas: Use kzalloc instead of kmalloc
USB: uas: Fix up the Sense IU
usb: musb: core: kill unneeded #include's
DA8xx: assign name to MUSB IRQ resource
usb: gadget: g_ncm added
usb: gadget: f_ncm.c added
usb: gadget: u_ether: prepare for NCM
usb: pch_udc: Fix setup transfers with data out
usb: pch_udc: Fix compile error, warnings and checkpatch warnings
usb: add ab8500 usb transceiver driver
USB: gadget: Implement runtime PM for MSM bus glue driver
USB: gadget: Implement runtime PM for ci13xxx gadget
USB: gadget: Add USB controller driver for MSM SoC
USB: gadget: Introduce ci13xxx_udc_driver struct
USB: gadget: Initialize ci13xxx gadget device's coherent DMA mask
USB: gadget: Fix "scheduling while atomic" bugs in ci13xxx_udc
USB: gadget: Separate out PCI bus code from ci13xxx_udc
...
Diffstat (limited to 'drivers/usb/host/ehci-hcd.c')
-rw-r--r-- | drivers/usb/host/ehci-hcd.c | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index e9062806d4a2..72732daa3b3e 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
@@ -114,6 +114,9 @@ MODULE_PARM_DESC(hird, "host initiated resume duration, +1 for each 75us\n"); | |||
114 | 114 | ||
115 | #define INTR_MASK (STS_IAA | STS_FATAL | STS_PCD | STS_ERR | STS_INT) | 115 | #define INTR_MASK (STS_IAA | STS_FATAL | STS_PCD | STS_ERR | STS_INT) |
116 | 116 | ||
117 | /* for ASPM quirk of ISOC on AMD SB800 */ | ||
118 | static struct pci_dev *amd_nb_dev; | ||
119 | |||
117 | /*-------------------------------------------------------------------------*/ | 120 | /*-------------------------------------------------------------------------*/ |
118 | 121 | ||
119 | #include "ehci.h" | 122 | #include "ehci.h" |
@@ -529,6 +532,11 @@ static void ehci_stop (struct usb_hcd *hcd) | |||
529 | spin_unlock_irq (&ehci->lock); | 532 | spin_unlock_irq (&ehci->lock); |
530 | ehci_mem_cleanup (ehci); | 533 | ehci_mem_cleanup (ehci); |
531 | 534 | ||
535 | if (amd_nb_dev) { | ||
536 | pci_dev_put(amd_nb_dev); | ||
537 | amd_nb_dev = NULL; | ||
538 | } | ||
539 | |||
532 | #ifdef EHCI_STATS | 540 | #ifdef EHCI_STATS |
533 | ehci_dbg (ehci, "irq normal %ld err %ld reclaim %ld (lost %ld)\n", | 541 | ehci_dbg (ehci, "irq normal %ld err %ld reclaim %ld (lost %ld)\n", |
534 | ehci->stats.normal, ehci->stats.error, ehci->stats.reclaim, | 542 | ehci->stats.normal, ehci->stats.error, ehci->stats.reclaim, |
@@ -1166,12 +1174,17 @@ MODULE_LICENSE ("GPL"); | |||
1166 | #define PLATFORM_DRIVER ehci_mxc_driver | 1174 | #define PLATFORM_DRIVER ehci_mxc_driver |
1167 | #endif | 1175 | #endif |
1168 | 1176 | ||
1177 | #ifdef CONFIG_CPU_SUBTYPE_SH7786 | ||
1178 | #include "ehci-sh.c" | ||
1179 | #define PLATFORM_DRIVER ehci_hcd_sh_driver | ||
1180 | #endif | ||
1181 | |||
1169 | #ifdef CONFIG_SOC_AU1200 | 1182 | #ifdef CONFIG_SOC_AU1200 |
1170 | #include "ehci-au1xxx.c" | 1183 | #include "ehci-au1xxx.c" |
1171 | #define PLATFORM_DRIVER ehci_hcd_au1xxx_driver | 1184 | #define PLATFORM_DRIVER ehci_hcd_au1xxx_driver |
1172 | #endif | 1185 | #endif |
1173 | 1186 | ||
1174 | #ifdef CONFIG_ARCH_OMAP3 | 1187 | #ifdef CONFIG_USB_EHCI_HCD_OMAP |
1175 | #include "ehci-omap.c" | 1188 | #include "ehci-omap.c" |
1176 | #define PLATFORM_DRIVER ehci_hcd_omap_driver | 1189 | #define PLATFORM_DRIVER ehci_hcd_omap_driver |
1177 | #endif | 1190 | #endif |
@@ -1216,6 +1229,21 @@ MODULE_LICENSE ("GPL"); | |||
1216 | #define PLATFORM_DRIVER ehci_octeon_driver | 1229 | #define PLATFORM_DRIVER ehci_octeon_driver |
1217 | #endif | 1230 | #endif |
1218 | 1231 | ||
1232 | #ifdef CONFIG_ARCH_VT8500 | ||
1233 | #include "ehci-vt8500.c" | ||
1234 | #define PLATFORM_DRIVER vt8500_ehci_driver | ||
1235 | #endif | ||
1236 | |||
1237 | #ifdef CONFIG_PLAT_SPEAR | ||
1238 | #include "ehci-spear.c" | ||
1239 | #define PLATFORM_DRIVER spear_ehci_hcd_driver | ||
1240 | #endif | ||
1241 | |||
1242 | #ifdef CONFIG_USB_EHCI_MSM | ||
1243 | #include "ehci-msm.c" | ||
1244 | #define PLATFORM_DRIVER ehci_msm_driver | ||
1245 | #endif | ||
1246 | |||
1219 | #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \ | 1247 | #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \ |
1220 | !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \ | 1248 | !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \ |
1221 | !defined(XILINX_OF_PLATFORM_DRIVER) | 1249 | !defined(XILINX_OF_PLATFORM_DRIVER) |