diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-21 16:07:34 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-21 16:07:34 -0700 |
| commit | 23a376f98c5dcfc392d47e8d1872884ff44e585d (patch) | |
| tree | dbe476151bbd6530369c40746f2ec2365f7b500a /arch/arm/mach-omap2/board-rx51.c | |
| parent | 8358f6242dd447a4f694c7bc949bbfc842ca5db1 (diff) | |
| parent | a937536b868b8369b98967929045f1df54234323 (diff) | |
Merge 3.9-rc3 into tty-next
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index f7c4616cbb60..d2ea68ea678a 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c @@ -17,6 +17,7 @@ #include <linux/io.h> #include <linux/gpio.h> #include <linux/leds.h> +#include <linux/usb/phy.h> #include <linux/usb/musb.h> #include <linux/platform_data/spi-omap2-mcspi.h> @@ -98,6 +99,7 @@ static void __init rx51_init(void) sdrc_params = nokia_get_sdram_timings(); omap_sdrc_init(sdrc_params, sdrc_params); + usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); usb_musb_init(&musb_board_data); rx51_peripherals_init(); |