aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiviu Dudau <Liviu.Dudau@arm.com>2014-03-10 10:55:37 +0000
committerSteve Capper <steve.capper@linaro.org>2014-08-11 13:21:15 +0100
commit960674c65651f27c02d4c5095970b5f1602d4c11 (patch)
treedd25e9a69fac7c4fbe5f58d65495ca9fa7b168c0
parent2aee21052121a1d39a8a1b899330fca3a9278de1 (diff)
downloadlinux-for-stevem/junobare-3.16.tar.gz
usb: Enable support for 64bit EHCI host controllers in arm64.for-stevem/junobare-3.16
arm64 architecture handles correctly 64bit DMAs and can enable support for 64bit EHCI host controllers. Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com> [steve.capper@linaro.org: merging this for now, it should be upstreamed.] Signed-off-by: Steve Capper <steve.capper@linaro.org>
-rw-r--r--drivers/usb/host/ehci-hcd.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 81cda09b47e..d1a48e49c0e 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -590,11 +590,16 @@ static int ehci_run (struct usb_hcd *hcd)
*/
hcc_params = ehci_readl(ehci, &ehci->caps->hcc_params);
if (HCC_64BIT_ADDR(hcc_params)) {
- ehci_writel(ehci, 0, &ehci->regs->segment);
-#if 0
-// this is deeply broken on almost all architectures
+#if CONFIG_ARM64
+ ehci_writel(ehci, ehci->periodic_dma >> 32, &ehci->regs->segment);
+ /*
+ * this is deeply broken on almost all architectures
+ * but arm64 can use it so enable it
+ */
if (!dma_set_mask(hcd->self.controller, DMA_BIT_MASK(64)))
ehci_info(ehci, "enabled 64bit DMA\n");
+#else
+ ehci_writel(ehci, 0, &ehci->regs->segment);
#endif
}