aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-hcd.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/host/ehci-hcd.c')
-rw-r--r--drivers/usb/host/ehci-hcd.c19
1 files changed, 18 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index d8f4aaa616f2..5859522d6edd 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -549,7 +549,7 @@ static int ehci_init(struct usb_hcd *hcd)
549 /* controllers may cache some of the periodic schedule ... */ 549 /* controllers may cache some of the periodic schedule ... */
550 hcc_params = ehci_readl(ehci, &ehci->caps->hcc_params); 550 hcc_params = ehci_readl(ehci, &ehci->caps->hcc_params);
551 if (HCC_ISOC_CACHE(hcc_params)) // full frame cache 551 if (HCC_ISOC_CACHE(hcc_params)) // full frame cache
552 ehci->i_thresh = 8; 552 ehci->i_thresh = 2 + 8;
553 else // N microframes cached 553 else // N microframes cached
554 ehci->i_thresh = 2 + HCC_ISOC_THRES(hcc_params); 554 ehci->i_thresh = 2 + HCC_ISOC_THRES(hcc_params);
555 555
@@ -605,6 +605,8 @@ static int ehci_init(struct usb_hcd *hcd)
605 } 605 }
606 ehci->command = temp; 606 ehci->command = temp;
607 607
608 /* Accept arbitrarily long scatter-gather lists */
609 hcd->self.sg_tablesize = ~0;
608 return 0; 610 return 0;
609} 611}
610 612
@@ -1105,11 +1107,21 @@ MODULE_LICENSE ("GPL");
1105#define PLATFORM_DRIVER ehci_fsl_driver 1107#define PLATFORM_DRIVER ehci_fsl_driver
1106#endif 1108#endif
1107 1109
1110#ifdef CONFIG_USB_EHCI_MXC
1111#include "ehci-mxc.c"
1112#define PLATFORM_DRIVER ehci_mxc_driver
1113#endif
1114
1108#ifdef CONFIG_SOC_AU1200 1115#ifdef CONFIG_SOC_AU1200
1109#include "ehci-au1xxx.c" 1116#include "ehci-au1xxx.c"
1110#define PLATFORM_DRIVER ehci_hcd_au1xxx_driver 1117#define PLATFORM_DRIVER ehci_hcd_au1xxx_driver
1111#endif 1118#endif
1112 1119
1120#ifdef CONFIG_ARCH_OMAP34XX
1121#include "ehci-omap.c"
1122#define PLATFORM_DRIVER ehci_hcd_omap_driver
1123#endif
1124
1113#ifdef CONFIG_PPC_PS3 1125#ifdef CONFIG_PPC_PS3
1114#include "ehci-ps3.c" 1126#include "ehci-ps3.c"
1115#define PS3_SYSTEM_BUS_DRIVER ps3_ehci_driver 1127#define PS3_SYSTEM_BUS_DRIVER ps3_ehci_driver
@@ -1120,6 +1132,11 @@ MODULE_LICENSE ("GPL");
1120#define OF_PLATFORM_DRIVER ehci_hcd_ppc_of_driver 1132#define OF_PLATFORM_DRIVER ehci_hcd_ppc_of_driver
1121#endif 1133#endif
1122 1134
1135#ifdef CONFIG_XPS_USB_HCD_XILINX
1136#include "ehci-xilinx-of.c"
1137#define OF_PLATFORM_DRIVER ehci_hcd_xilinx_of_driver
1138#endif
1139
1123#ifdef CONFIG_PLAT_ORION 1140#ifdef CONFIG_PLAT_ORION
1124#include "ehci-orion.c" 1141#include "ehci-orion.c"
1125#define PLATFORM_DRIVER ehci_orion_driver 1142#define PLATFORM_DRIVER ehci_orion_driver