aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-05-15 05:51:45 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-06-04 05:12:03 -0400
commit1e6eebb4e907548d53347a6e90769feb3d73e9da (patch)
tree2fc64cb4339a0783fbad0ad294d22984ea9a0437
parenta20b1b791e42d84dedd5854b60abb841ec1a7585 (diff)
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>
-rw-r--r--arch/arm/mach-ux500/usb.c3
-rw-r--r--drivers/usb/musb/ux500.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/usb.c b/arch/arm/mach-ux500/usb.c
index 49d6e571f5af..2f9abe99dfaa 100644
--- a/arch/arm/mach-ux500/usb.c
+++ b/arch/arm/mach-ux500/usb.c
@@ -74,8 +74,6 @@ static struct ux500_musb_board_data musb_board_data = {
74 .dma_filter = stedma40_filter, 74 .dma_filter = stedma40_filter,
75}; 75};
76 76
77static u64 ux500_musb_dmamask = DMA_BIT_MASK(32);
78
79static struct musb_hdrc_platform_data musb_platform_data = { 77static struct musb_hdrc_platform_data musb_platform_data = {
80 .mode = MUSB_OTG, 78 .mode = MUSB_OTG,
81 .board_data = &musb_board_data, 79 .board_data = &musb_board_data,
@@ -98,7 +96,6 @@ struct platform_device ux500_musb_device = {
98 .id = 0, 96 .id = 0,
99 .dev = { 97 .dev = {
100 .platform_data = &musb_platform_data, 98 .platform_data = &musb_platform_data,
101 .dma_mask = &ux500_musb_dmamask,
102 .coherent_dma_mask = DMA_BIT_MASK(32), 99 .coherent_dma_mask = DMA_BIT_MASK(32),
103 }, 100 },
104 .num_resources = ARRAY_SIZE(usb_resources), 101 .num_resources = ARRAY_SIZE(usb_resources),
diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c
index 371776f76ba2..3cf10bcaf118 100644
--- a/drivers/usb/musb/ux500.c
+++ b/drivers/usb/musb/ux500.c
@@ -228,7 +228,7 @@ static int ux500_probe(struct platform_device *pdev)
228 } 228 }
229 229
230 musb->dev.parent = &pdev->dev; 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 musb->dev.coherent_dma_mask = pdev->dev.coherent_dma_mask; 232 musb->dev.coherent_dma_mask = pdev->dev.coherent_dma_mask;
233 233
234 glue->dev = &pdev->dev; 234 glue->dev = &pdev->dev;