summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@stericsson.com>2011-11-15 16:00:14 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2011-11-15 16:32:47 +0100
commit9faa4d3eba7d60ef6489b09190b5f0d6b3ad624b (patch)
tree6879496c52b002d5add30546e0af6aada257e802
parentfd7aeaf47b909e81824ea8be2a610f6c2089a7e7 (diff)
Revert "mach-ux500: musb: Now musb is always in OTG mode"android
This reverts commit ac28162fc038d50e64ff2e81d64046be22533e0f.
-rw-r--r--arch/arm/mach-ux500/usb.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/usb.c b/arch/arm/mach-ux500/usb.c
index 1e7c0cc912e..363282eae61 100644
--- a/arch/arm/mach-ux500/usb.c
+++ b/arch/arm/mach-ux500/usb.c
@@ -105,7 +105,13 @@ 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,
};