Hi, > On 10/11/11 13:26, Ajay Kumar Gupta wrote: > > From: Ravi Babu <ravibabu@xxxxxx> > > > > Adding musb support in ti816 EVM board file. > > > > Signed-off-by: Ajay Kumar Gupta <ajay.gupta@xxxxxx> > > Signed-off-by: Ravi Babu <ravibabu@xxxxxx> > > Acked-by: Felipe Balbi <balbi@xxxxxx> > > This patch can result in a merge conflict, therefore I think > this one should be taken through Tony's tree. > > Also you should work together with Hemant Pedanekar and > someone of you should rebase on top of the other otherwise > one of the patches (yours or Hemant's) possibly will not apply. Ok sure. I will submit the patches (v5) after creating it on top of Hemant's and Vaibhav's patches. Thanks, Ajay > > > --- > > arch/arm/mach-omap2/board-ti8168evm.c | 9 +++++++++ > > 1 files changed, 9 insertions(+), 0 deletions(-) > > > > diff --git a/arch/arm/mach-omap2/board-ti8168evm.c b/arch/arm/mach- > omap2/board-ti8168evm.c > > index 2c243df..1f3d423 100644 > > --- a/arch/arm/mach-omap2/board-ti8168evm.c > > +++ b/arch/arm/mach-omap2/board-ti8168evm.c > > @@ -23,6 +23,14 @@ > > #include <plat/irqs.h> > > #include <plat/board.h> > > #include <plat/common.h> > > +#include <plat/usb.h> > > + > > +static struct omap_musb_board_data musb_board_data = { > > + .set_phy_power = ti81xx_musb_phy_power, > > + .interface_type = MUSB_INTERFACE_ULPI, > > + .mode = MUSB_OTG, > > + .power = 500, > > +}; > > > > static struct omap_board_config_kernel ti8168_evm_config[] __initdata > = { > > }; > > @@ -33,6 +41,7 @@ static void __init ti8168_evm_init(void) > > omap_sdrc_init(NULL, NULL); > > omap_board_config = ti8168_evm_config; > > omap_board_config_size = ARRAY_SIZE(ti8168_evm_config); > > + usb_musb_init(&musb_board_data); > > } > > > > static void __init ti8168_evm_map_io(void) > > -- > Regards, > Igor. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html