Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

usb: musb: ux500: take the dma_mask from coherent_dma_mask

The dma_mask will always be the same as the coherent_dma_mask, so let's
cut down on the platform_data burden and set it as such in the driver.
This also saves us from supporting it separately when we come to enable
this driver for Device Tree.

Cc: linux-usb@vger.kernel.org
Acked-by: Felipe Balbi <balbi@ti.com>
Acked-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

authored by

Lee Jones and committed by
Linus Walleij
1e6eebb4 a20b1b79

+1 -4
-3
arch/arm/mach-ux500/usb.c
··· 74 74 .dma_filter = stedma40_filter, 75 75 }; 76 76 77 - static u64 ux500_musb_dmamask = DMA_BIT_MASK(32); 78 - 79 77 static struct musb_hdrc_platform_data musb_platform_data = { 80 78 .mode = MUSB_OTG, 81 79 .board_data = &musb_board_data, ··· 96 98 .id = 0, 97 99 .dev = { 98 100 .platform_data = &musb_platform_data, 99 - .dma_mask = &ux500_musb_dmamask, 100 101 .coherent_dma_mask = DMA_BIT_MASK(32), 101 102 }, 102 103 .num_resources = ARRAY_SIZE(usb_resources),
+1 -1
drivers/usb/musb/ux500.c
··· 228 228 } 229 229 230 230 musb->dev.parent = &pdev->dev; 231 - musb->dev.dma_mask = pdev->dev.dma_mask; 231 + musb->dev.dma_mask = &pdev->dev.coherent_dma_mask; 232 232 musb->dev.coherent_dma_mask = pdev->dev.coherent_dma_mask; 233 233 234 234 glue->dev = &pdev->dev;