]> Pileus Git - ~andy/linux/commitdiff
ARM: davinci: usb: remove CONFIG_USB_MUSB_HOST etc
authorConstantine Shulyupin <const@MakeLinux.com>
Mon, 8 Oct 2012 13:17:07 +0000 (15:17 +0200)
committerSekhar Nori <nsekhar@ti.com>
Wed, 24 Oct 2012 11:07:17 +0000 (16:37 +0530)
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>
arch/arm/mach-davinci/usb.c

index f77b95336e2bd7b3d378c9539fa1b7d60b28a4bd..34509ffba221e18fb65670b5760870b71460f032 100644 (file)
@@ -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,
 };