diff options
author | Andreas Herrmann <andreas.herrmann@caviumnetworks.com> | 2015-01-12 10:05:52 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-25 07:48:28 -0500 |
commit | c99e76c55f68eaa0c307ba25803c4e59c2fca1ca (patch) | |
tree | 15b4b0b3210fcb9235b28df11a02808b784558bd /arch/mips/cavium-octeon/octeon-platform.c | |
parent | a5790e9e834bb48cb681620ec680203edb536242 (diff) |
USB: host: Introduce flag to enable use of 64-bit dma_mask for ehci-platform
ehci-octeon driver used a 64-bit dma_mask. With removal of ehci-octeon
and usage of ehci-platform ehci dma_mask is now limited to 32 bits
(coerced in ehci_platform_probe).
Provide a flag in ehci platform data to allow use of 64 bits for
dma_mask.
Cc: David Daney <david.daney@cavium.com>
Cc: Alex Smith <alex.smith@imgtec.com>
Signed-off-by: Andreas Herrmann <andreas.herrmann@caviumnetworks.com>
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips/cavium-octeon/octeon-platform.c')
-rw-r--r-- | arch/mips/cavium-octeon/octeon-platform.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c index eea60b6c927b..12410a2788d8 100644 --- a/arch/mips/cavium-octeon/octeon-platform.c +++ b/arch/mips/cavium-octeon/octeon-platform.c | |||
@@ -310,6 +310,7 @@ static struct usb_ehci_pdata octeon_ehci_pdata = { | |||
310 | #ifdef __BIG_ENDIAN | 310 | #ifdef __BIG_ENDIAN |
311 | .big_endian_mmio = 1, | 311 | .big_endian_mmio = 1, |
312 | #endif | 312 | #endif |
313 | .dma_mask_64 = 1, | ||
313 | .power_on = octeon_ehci_power_on, | 314 | .power_on = octeon_ehci_power_on, |
314 | .power_off = octeon_ehci_power_off, | 315 | .power_off = octeon_ehci_power_off, |
315 | }; | 316 | }; |
@@ -331,8 +332,6 @@ static void __init octeon_ehci_hw_start(struct device *dev) | |||
331 | octeon2_usb_clocks_stop(); | 332 | octeon2_usb_clocks_stop(); |
332 | } | 333 | } |
333 | 334 | ||
334 | static u64 octeon_ehci_dma_mask = DMA_BIT_MASK(64); | ||
335 | |||
336 | static int __init octeon_ehci_device_init(void) | 335 | static int __init octeon_ehci_device_init(void) |
337 | { | 336 | { |
338 | struct platform_device *pd; | 337 | struct platform_device *pd; |
@@ -347,7 +346,6 @@ static int __init octeon_ehci_device_init(void) | |||
347 | if (!pd) | 346 | if (!pd) |
348 | return 0; | 347 | return 0; |
349 | 348 | ||
350 | pd->dev.dma_mask = &octeon_ehci_dma_mask; | ||
351 | pd->dev.platform_data = &octeon_ehci_pdata; | 349 | pd->dev.platform_data = &octeon_ehci_pdata; |
352 | octeon_ehci_hw_start(&pd->dev); | 350 | octeon_ehci_hw_start(&pd->dev); |
353 | 351 | ||