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-15 10:29:23 +0100
commitf775ea739df08132aa535df71353243b984c4a82 (patch)
tree1e8f9d0991f6385aadfd0ccd974b6466b11254d4
parent3d05958355754b90830d31283f982efd0213640c (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,
};