diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-12-20 12:42:31 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-01-13 14:53:10 +0100 |
| commit | 21ca9f7303abf7fb599c1be81fa74d700e3df63b (patch) | |
| tree | 204ea42697149484402310842e26ec1a884f6deb | |
| parent | c8a60ba6986b3094176f7c43527004812437e6b1 (diff) | |
Revert "mach-ux500: musb: Now musb is always in OTG mode"
This reverts commit ac28162fc038d50e64ff2e81d64046be22533e0f.
| -rw-r--r-- | arch/arm/mach-ux500/usb.c | 6 |
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, }; |