diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-01-10 14:23:41 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-01-10 14:23:41 -0800 |
| commit | 274353674dd0337bdeeaee08a9f2047777b07ab0 (patch) | |
| tree | b788d77dd7c0e8f27bbcc89fc742c212c28872c0 /arch/arm/mach-omap2/board-omap4panda.c | |
| parent | 1740d483ba4d79f9fa6984dccd7152b6b208f1bf (diff) | |
| parent | d7cd5c73cec2dfa9f259a2adcf802c9f8fcc125f (diff) | |
Merge branch 'ehci-omap-clock' into omap-fixes
Diffstat (limited to 'arch/arm/mach-omap2/board-omap4panda.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 613bdd89bcf..e001a048dc0 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -144,10 +144,17 @@ error1: static struct omap_musb_board_data musb_board_data = { .interface_type = MUSB_INTERFACE_UTMI, - .mode = MUSB_PERIPHERAL, + .mode = MUSB_OTG, .power = 100, }; +static struct twl4030_usb_data omap4_usbphy_data = { + .phy_init = omap4430_phy_init, + .phy_exit = omap4430_phy_exit, + .phy_power = omap4430_phy_power, + .phy_set_clock = omap4430_phy_set_clk, +}; + static struct omap2_hsmmc_info mmc[] = { { .mmc = 1, @@ -357,6 +364,7 @@ static struct twl4030_platform_data omap4_panda_twldata = { .vaux1 = &omap4_panda_vaux1, .vaux2 = &omap4_panda_vaux2, .vaux3 = &omap4_panda_vaux3, + .usb = &omap4_usbphy_data, }; static struct i2c_board_info __initdata omap4_panda_i2c_boardinfo[] = { @@ -404,9 +412,7 @@ static void __init omap4_panda_init(void) /* OMAP4 Panda uses internal transceiver so register nop transceiver */ usb_nop_xceiv_register(); omap4_ehci_init(); - /* FIXME: allow multi-omap to boot until musb is updated for omap4 */ - if (!cpu_is_omap44xx()) - usb_musb_init(&musb_board_data); + usb_musb_init(&musb_board_data); } static void __init omap4_panda_map_io(void) |