github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 22:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge remote-tracking branch 'lsk/v3.10/topic/arm64-usb' into linux-linaro-lsk

Browse Source
This commit is contained in:
Mark Brown 2014-05-14 18:52:08 +01:00
commit 31c39ee311
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/usb/host/ehci-hcd.c
View File

@ -591,11 +591,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
}

2
drivers/usb/phy/Kconfig
View File

@ -198,7 +198,7 @@ config USB_RCAR_PHY
config USB_ULPI
bool "Generic ULPI Transceiver Driver"
depends on ARM
depends on ARM || ARM64
help
Enable this to support ULPI connected USB OTG transceivers which
are likely found on embedded boards.