Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e6eebb4 authored by Lee Jones's avatar Lee Jones Committed by Linus Walleij
Browse files

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: default avatarFelipe Balbi <balbi@ti.com>
Acked-by: default avatarFabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a20b1b79

arch/arm/mach-ux500/usb.c

+0 −3
Original line number Diff line number Diff line
@@ -74,8 +74,6 @@ static struct ux500_musb_board_data musb_board_data = { 
	.dma_filter = stedma40_filter,

};



static u64 ux500_musb_dmamask = DMA_BIT_MASK(32);



static struct musb_hdrc_platform_data musb_platform_data = {

	.mode = MUSB_OTG,

	.board_data = &musb_board_data,
@@ -98,7 +96,6 @@ struct platform_device ux500_musb_device = { 
	.id = 0,

	.dev = {

		.platform_data = &musb_platform_data,

		.dma_mask = &ux500_musb_dmamask,

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

	.num_resources = ARRAY_SIZE(usb_resources),

drivers/usb/musb/ux500.c

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static int ux500_probe(struct platform_device *pdev) 
	}



	musb->dev.parent		= &pdev->dev;

	musb->dev.dma_mask		= pdev->dev.dma_mask;

	musb->dev.dma_mask		= &pdev->dev.coherent_dma_mask;

	musb->dev.coherent_dma_mask	= pdev->dev.coherent_dma_mask;



	glue->dev			= &pdev->dev;