From 9faa4d3eba7d60ef6489b09190b5f0d6b3ad624b Mon Sep 17 00:00:00 2001 From: Philippe Langlais Date: Tue, 15 Nov 2011 16:00:14 +0100 Subject: Revert "mach-ux500: musb: Now musb is always in OTG mode" This reverts commit ac28162fc038d50e64ff2e81d64046be22533e0f. --- arch/arm/mach-ux500/usb.c | 6 ++++++ 1 file changed, 6 insertions(+) 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, }; -- cgit v1.2.3