| Message ID | 1313658764-28907-1-git-send-email-ajay.gupta@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, On Thu, Aug 18, 2011 at 02:42:44PM +0530, Ajay Kumar Gupta wrote: > The .power and .mode parameter of 'musb_plat' is also now set dynamically > in usb_musb_init() so remove them. > > Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> Acked-by: Felipe Balbi <balbi@ti.com> Tony, can you pick this up for next ? > --- > arch/arm/mach-omap2/usb-musb.c | 15 +-------------- > 1 files changed, 1 insertions(+), 14 deletions(-) > > diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c > index a65145b..de48106 100644 > --- a/arch/arm/mach-omap2/usb-musb.c > +++ b/arch/arm/mach-omap2/usb-musb.c > @@ -41,21 +41,8 @@ static struct musb_hdrc_config musb_config = { > }; > > static struct musb_hdrc_platform_data musb_plat = { > -#ifdef CONFIG_USB_MUSB_OTG > - .mode = MUSB_OTG, > -#elif defined(CONFIG_USB_MUSB_HDRC_HCD) > - .mode = MUSB_HOST, > -#elif defined(CONFIG_USB_GADGET_MUSB_HDRC) > - .mode = MUSB_PERIPHERAL, > -#endif > - /* .clock is set dynamically */ > + /* .clock, .mode and .power is set dynamically */ > .config = &musb_config, > - > - /* REVISIT charge pump on TWL4030 can supply up to > - * 100 mA ... but this value is board-specific, like > - * "mode", and should be passed to usb_musb_init(). > - */ > - .power = 50, /* up to 100 mA */ > }; > > static u64 musb_dmamask = DMA_BIT_MASK(32); > -- > 1.6.2.4 >
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c index a65145b..de48106 100644 --- a/arch/arm/mach-omap2/usb-musb.c +++ b/arch/arm/mach-omap2/usb-musb.c @@ -41,21 +41,8 @@ static struct musb_hdrc_config musb_config = { }; static struct musb_hdrc_platform_data musb_plat = { -#ifdef CONFIG_USB_MUSB_OTG - .mode = MUSB_OTG, -#elif defined(CONFIG_USB_MUSB_HDRC_HCD) - .mode = MUSB_HOST, -#elif defined(CONFIG_USB_GADGET_MUSB_HDRC) - .mode = MUSB_PERIPHERAL, -#endif - /* .clock is set dynamically */ + /* .clock, .mode and .power is set dynamically */ .config = &musb_config, - - /* REVISIT charge pump on TWL4030 can supply up to - * 100 mA ... but this value is board-specific, like - * "mode", and should be passed to usb_musb_init(). - */ - .power = 50, /* up to 100 mA */ }; static u64 musb_dmamask = DMA_BIT_MASK(32);
The .power and .mode parameter of 'musb_plat' is also now set dynamically in usb_musb_init() so remove them. Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> --- arch/arm/mach-omap2/usb-musb.c | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-)