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

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

usb: musb: ux500: move the MUSB HDRC configuration into the driver 



The MUSB HDRC configuration never changes between each of the ux500
supported platforms, so there's little point passing it though platform
data. If we set it in the driver instead, we can make good use of it
when booting with either ATAGs or 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 be2dbb09

arch/arm/mach-ux500/usb.c

+0 −8
Original line number Diff line number Diff line
@@ -76,16 +76,8 @@ static struct ux500_musb_board_data musb_board_data = { 


static u64 ux500_musb_dmamask = DMA_BIT_MASK(32);



static struct musb_hdrc_config musb_hdrc_config = {

	.multipoint	= true,

	.dyn_fifo	= true,

	.num_eps	= 16,

	.ram_bits	= 16,

};



static struct musb_hdrc_platform_data musb_platform_data = {

	.mode = MUSB_OTG,

	.config = &musb_hdrc_config,

	.board_data = &musb_board_data,

};

drivers/usb/musb/ux500.c

+8 −0
Original line number Diff line number Diff line
@@ -30,6 +30,13 @@ 


#include "musb_core.h"



static struct musb_hdrc_config ux500_musb_hdrc_config = {

	.multipoint	= true,

	.dyn_fifo	= true,

	.num_eps	= 16,

	.ram_bits	= 16,

};



struct ux500_glue {

	struct device		*dev;

	struct platform_device	*musb;
@@ -229,6 +236,7 @@ static int ux500_probe(struct platform_device *pdev) 
	glue->clk			= clk;



	pdata->platform_ops		= &ux500_ops;

	pdata->config 			= &ux500_musb_hdrc_config;



	platform_set_drvdata(pdev, glue);