diff options
| -rw-r--r-- | arch/arm/mach-omap2/board-n8x0.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/usb-musb.c | 5 |
2 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c index f6eeb87e4e95..827d15009a86 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c | |||
| @@ -122,11 +122,7 @@ static struct musb_hdrc_config musb_config = { | |||
| 122 | }; | 122 | }; |
| 123 | 123 | ||
| 124 | static struct musb_hdrc_platform_data tusb_data = { | 124 | static struct musb_hdrc_platform_data tusb_data = { |
| 125 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC | ||
| 126 | .mode = MUSB_OTG, | 125 | .mode = MUSB_OTG, |
| 127 | #else | ||
| 128 | .mode = MUSB_HOST, | ||
| 129 | #endif | ||
| 130 | .set_power = tusb_set_power, | 126 | .set_power = tusb_set_power, |
| 131 | .min_power = 25, /* x2 = 50 mA drawn from VBUS as peripheral */ | 127 | .min_power = 25, /* x2 = 50 mA drawn from VBUS as peripheral */ |
| 132 | .power = 100, /* Max 100 mA VBUS for host mode */ | 128 | .power = 100, /* Max 100 mA VBUS for host mode */ |
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c index 8c4de2708cf2..bc897231bd10 100644 --- a/arch/arm/mach-omap2/usb-musb.c +++ b/arch/arm/mach-omap2/usb-musb.c | |||
| @@ -38,11 +38,8 @@ static struct musb_hdrc_config musb_config = { | |||
| 38 | }; | 38 | }; |
| 39 | 39 | ||
| 40 | static struct musb_hdrc_platform_data musb_plat = { | 40 | static struct musb_hdrc_platform_data musb_plat = { |
| 41 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC | ||
| 42 | .mode = MUSB_OTG, | 41 | .mode = MUSB_OTG, |
| 43 | #else | 42 | |
| 44 | .mode = MUSB_HOST, | ||
| 45 | #endif | ||
| 46 | /* .clock is set dynamically */ | 43 | /* .clock is set dynamically */ |
| 47 | .config = &musb_config, | 44 | .config = &musb_config, |
| 48 | 45 | ||
