diff options
| author | Tony Prisk <linux@prisktech.co.nz> | 2012-10-14 16:22:35 +1300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-17 13:42:29 -0700 |
| commit | 6e1babb3ff2651376f2e9843569fcb39cfe4686b (patch) | |
| tree | 1e41a52ea93f66123cf3f99531a79c61720bbb93 /drivers | |
| parent | 09eeffb70c086692064f4224490d1cd2ffe43bdd (diff) | |
| download | linux-3.10-6e1babb3ff2651376f2e9843569fcb39cfe4686b.tar.gz linux-3.10-6e1babb3ff2651376f2e9843569fcb39cfe4686b.tar.bz2 linux-3.10-6e1babb3ff2651376f2e9843569fcb39cfe4686b.zip | |
usb: Missing dma_mask in ehci-vt8500.c when probed from device-tree
Device-tree probed devices don't get a dev.dma_mask set. This patch
sets a default 32bit mask on arch-vt8500 when using devicetree.
Without this patch, arch-vt8500 cannot detect ehci attached devices.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/host/ehci-vt8500.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-vt8500.c b/drivers/usb/host/ehci-vt8500.c index 96722bfebc8..d3c9a3e397b 100644 --- a/drivers/usb/host/ehci-vt8500.c +++ b/drivers/usb/host/ehci-vt8500.c @@ -85,6 +85,8 @@ static const struct hc_driver vt8500_ehci_hc_driver = { .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete, }; +static u64 vt8500_ehci_dma_mask = DMA_BIT_MASK(32); + static int vt8500_ehci_drv_probe(struct platform_device *pdev) { struct usb_hcd *hcd; @@ -95,6 +97,14 @@ static int vt8500_ehci_drv_probe(struct platform_device *pdev) if (usb_disabled()) return -ENODEV; + /* + * Right now device-tree probed devices don't get dma_mask set. + * Since shared usb code relies on it, set it here for now. + * Once we have dma capability bindings this can go away. + */ + if (!pdev->dev.dma_mask) + pdev->dev.dma_mask = &vt8500_ehci_dma_mask; + if (pdev->resource[1].flags != IORESOURCE_IRQ) { pr_debug("resource[1] is not IORESOURCE_IRQ"); return -ENOMEM; |