Merge ../linus

[linux-drm-fsl-dcu.git] / arch / arm / plat-omap / usb.c

diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c
index 205e2d0b826d4f4ff53f24c73a71970b88be10a2..7e8096809be2bc227ef4e8acb310455a92d8cbfb 100644 (file)
--- a/arch/arm/plat-omap/usb.c
+++ b/arch/arm/plat-omap/usb.c
@@ -20,14 +20,13 @@
 
 #undef DEBUG
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/usb_otg.h>
+#include <linux/usb/otg.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -91,6 +90,8 @@ EXPORT_SYMBOL(otg_set_transceiver);
 
 /*-------------------------------------------------------------------------*/
 
+#if defined(CONFIG_ARCH_OMAP_OTG) || defined(CONFIG_ARCH_OMAP15XX)
+
 static u32 __init omap_usb0_init(unsigned nwires, unsigned is_device)
 {
        u32     syscon1 = 0;
@@ -271,6 +272,8 @@ static u32 __init omap_usb2_init(unsigned nwires, unsigned alt_pingroup)
        return syscon1 << 24;
 }
 
+#endif
+
 /*-------------------------------------------------------------------------*/
 
 #if    defined(CONFIG_USB_GADGET_OMAP) || \
@@ -494,7 +497,7 @@ static inline void omap_otg_init(struct omap_usb_config *config) {}
 
 /*-------------------------------------------------------------------------*/
 
-#ifdef CONFIG_ARCH_OMAP1510
+#ifdef CONFIG_ARCH_OMAP15XX
 
 #define ULPD_DPLL_CTRL_REG     __REG16(ULPD_DPLL_CTRL)
 #define DPLL_IOB               (1 << 13)
@@ -507,7 +510,6 @@ static inline void omap_otg_init(struct omap_usb_config *config) {}
 
 static void __init omap_1510_usb_init(struct omap_usb_config *config)
 {
-       int status;
        unsigned int val;
 
        omap_usb0_init(config->pins[0], is_usb0_device(config));
@@ -539,6 +541,8 @@ static void __init omap_1510_usb_init(struct omap_usb_config *config)
 
 #ifdef CONFIG_USB_GADGET_OMAP
        if (config->register_dev) {
+               int status;
+
                udc_device.dev.platform_data = config;
                status = platform_device_register(&udc_device);
                if (status)
@@ -549,6 +553,8 @@ static void __init omap_1510_usb_init(struct omap_usb_config *config)
 
 #if    defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
        if (config->register_host) {
+               int status;
+
                ohci_device.dev.platform_data = config;
                status = platform_device_register(&ohci_device);
                if (status)