diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-02-22 19:54:12 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-22 19:54:12 +0100 |
| commit | 04aa67dec63b61c1a8b9b6d001262250f1a92130 (patch) | |
| tree | 7e0d2cfb30f904ffbd2ac39a055cd53034c873b7 /arch/arm/mach-omap2/board-am3517evm.c | |
| parent | OMAP4: hwmod data: Prevent timer1 to be reset and idle during init (diff) | |
| parent | OMAP2+: musb: hwmod adaptation for musb registration (diff) | |
| download | linux-04aa67dec63b61c1a8b9b6d001262250f1a92130.tar.xz linux-04aa67dec63b61c1a8b9b6d001262250f1a92130.zip | |
Merge branch 'for-tony' of git://gitorious.org/usb/usb into omap-for-linus
Conflicts:
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Diffstat (limited to 'arch/arm/mach-omap2/board-am3517evm.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-am3517evm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index d0d0f5528132..8532d6e0d53a 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c @@ -408,6 +408,10 @@ static struct omap_musb_board_data musb_board_data = { .interface_type = MUSB_INTERFACE_ULPI, .mode = MUSB_OTG, .power = 500, + .set_phy_power = am35x_musb_phy_power, + .clear_irq = am35x_musb_clear_irq, + .set_mode = am35x_musb_set_mode, + .reset = am35x_musb_reset, }; static __init void am3517_evm_musb_init(void) |