summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConstantine Shulyupin <const@MakeLinux.com>2012-10-08 15:17:07 +0200
committerSekhar Nori <nsekhar@ti.com>2012-10-24 16:37:17 +0530
commit0e0575197259d5de13c51cac0b98336506fd2f85 (patch)
tree7abf2ddc8b56e34ad4d8d0ca9ac886424b6eba4a
parent6f0c0580b70c89094b3422ba81118c7b959c7556 (diff)
downloadop-kernel-dev-0e0575197259d5de13c51cac0b98336506fd2f85.zip
op-kernel-dev-0e0575197259d5de13c51cac0b98336506fd2f85.tar.gz
ARM: davinci: usb: remove CONFIG_USB_MUSB_HOST etc
Remove usage of CONFIG_USB_MUSB_OTG, CONFIG_USB_MUSB_PERIPHERAL and CONFIG_USB_MUSB_HOST in arch/arm/mach-davinci/usb.c since these are not used anymore and set mode configuration by default to MUSB_OTG. Signed-off-by: Constantine Shulyupin <const@MakeLinux.com> [prakash.pm@ti.com: Tested on DM6446-EVM] Acked-by: Manjunathappa, Prakash <prakash.pm@ti.com> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
-rw-r--r--arch/arm/mach-davinci/usb.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c
index f77b953..34509ff 100644
--- a/arch/arm/mach-davinci/usb.c
+++ b/arch/arm/mach-davinci/usb.c
@@ -42,14 +42,8 @@ static struct musb_hdrc_config musb_config = {
};
static struct musb_hdrc_platform_data usb_data = {
-#if defined(CONFIG_USB_MUSB_OTG)
/* OTG requires a Mini-AB connector */
.mode = MUSB_OTG,
-#elif defined(CONFIG_USB_MUSB_PERIPHERAL)
- .mode = MUSB_PERIPHERAL,
-#elif defined(CONFIG_USB_MUSB_HOST)
- .mode = MUSB_HOST,
-#endif
.clock = "usb",
.config = &musb_config,
};
OpenPOWER on IntegriCloud