summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2012-02-02 13:57:25 +0100
committerPhilippe Langlais <philippe.langlais@linaro.org>2012-02-02 14:00:43 +0100
commit16ae518e914e8c48e68711c78af772cad1adbe21 (patch)
tree39e1d6d16c443c323167406ce9f1c4fab6029a5b
parent0105311e0be8f2b0ff76472a9e07c8a47d54df76 (diff)
Revert "Revert "mach-ux500: musb: Now musb is always in OTG mode""
This reverts commit 21ca9f7303abf7fb599c1be81fa74d700e3df63b.
-rw-r--r--arch/arm/mach-ux500/usb.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-ux500/usb.c b/arch/arm/mach-ux500/usb.c
index 363282eae61..1e7c0cc912e 100644
--- a/arch/arm/mach-ux500/usb.c
+++ b/arch/arm/mach-ux500/usb.c
@@ -105,13 +105,7 @@ static struct musb_hdrc_config musb_hdrc_config = {
};
static struct musb_hdrc_platform_data musb_platform_data = {
-#if defined(CONFIG_USB_MUSB_OTG)
.mode = MUSB_OTG,
-#elif defined(CONFIG_USB_MUSB_PERIPHERAL)
- .mode = MUSB_PERIPHERAL,
-#else /* defined(CONFIG_USB_MUSB_HOST) */
- .mode = MUSB_HOST,
-#endif
.config = &musb_hdrc_config,
.board_data = &musb_board_data,
};