ARMV7: Restructure omap3 musb driver to allow code sharing between OMAP3 and OMAP4

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>

diff --git a/arch/arm/include/asm/arch-omap3/cpu.h b/arch/arm/include/asm/arch-omap3/cpu.h
index c072c27bbf007df1d628c8f5a117457eebada5e0..390b00794516793d6ebe1c4f369d6c2426f114b7 100644 (file)
--- a/arch/arm/include/asm/arch-omap3/cpu.h
+++ b/arch/arm/include/asm/arch-omap3/cpu.h
@@ -483,4 +483,7 @@ struct pm {
 #define I2C_BASE2              (OMAP34XX_CORE_L4_IO_BASE + 0x72000)
 #define I2C_BASE3              (OMAP34XX_CORE_L4_IO_BASE + 0x60000)
 
+/* MUSB base */
+#define MUSB_BASE              (OMAP34XX_CORE_L4_IO_BASE + 0xAB000)
+
 #endif /* _CPU_H */

diff --git a/arch/arm/include/asm/arch-omap4/cpu.h b/arch/arm/include/asm/arch-omap4/cpu.h
index c056b9501b8d2164e21d0f48fe903a50b0cabe4a..7d5748acd4d025dbb0e59cde0bd285c091f58b0c 100644 (file)
--- a/arch/arm/include/asm/arch-omap4/cpu.h
+++ b/arch/arm/include/asm/arch-omap4/cpu.h
@@ -139,4 +139,7 @@ struct watchdog {
 #define I2C_BASE2              (OMAP44XX_L4_PER_BASE + 0x72000)
 #define I2C_BASE3              (OMAP44XX_L4_PER_BASE + 0x60000)
 
+/* MUSB base */
+#define MUSB_BASE              (OMAP44XX_L4_CORE_BASE + 0xAB000)
+
 #endif /* _CPU_H */

diff --git a/drivers/usb/musb/omap3.c b/drivers/usb/musb/omap3.c
index a983552357c16e185064a71a9a7f79d2b553089b..c7876ed094b1a8bd02eb552babea20db4fe61487 100644 (file)
--- a/drivers/usb/musb/omap3.c
+++ b/drivers/usb/musb/omap3.c
@@ -31,6 +31,7 @@
  */
 
 #include <twl4030.h>
+#include <twl6030.h>
 #include "omap3.h"
 
 static int platform_needs_initialization = 1;
@@ -65,7 +66,12 @@ static struct omap3_otg_regs *otg;
 
 #define OMAP3_OTG_SYSSTATUS_RESETDONE                  0x0001
 
+/* OMAP4430 has an internal PHY, use it */
+#ifdef CONFIG_OMAP4430
+#define OMAP3_OTG_INTERFSEL_OMAP                       0x0000
+#else
 #define OMAP3_OTG_INTERFSEL_OMAP                       0x0001
+#endif
 
 #define OMAP3_OTG_FORCESTDBY_STANDBY                   0x0001
 
@@ -105,6 +111,11 @@ int musb_platform_init(void)
                        goto end;
                }
 #endif
+
+#ifdef CONFIG_TWL6030_POWER
+               twl6030_usb_device_settings();
+#endif
+
                otg = (struct omap3_otg_regs *)OMAP3_OTG_BASE;
 
                /* Set OTG to always be on */
@@ -122,6 +133,11 @@ int musb_platform_init(void)
 #ifdef CONFIG_OMAP3_EVM
                musb_cfg.extvbus = omap3_evm_need_extvbus();
 #endif
+
+#ifdef CONFIG_OMAP4430
+               u32 *usbotghs_control = (u32 *)(CTRL_BASE + 0x33C);
+               *usbotghs_control = 0x15;
+#endif
                platform_needs_initialization = 0;
        }
 

diff --git a/drivers/usb/musb/omap3.h b/drivers/usb/musb/omap3.h
index 2886d7e704801d516e11fc3d4fbfe74d91762f61..b2acdf4bc6ab1eec4cbdb49b7950f0e4fb70d63c 100644 (file)
--- a/drivers/usb/musb/omap3.h
+++ b/drivers/usb/musb/omap3.h
@@ -31,10 +31,11 @@
 #ifndef _MUSB_OMAP3_H_
 #define _MUSB_OMAP3_H_
 
+#include <asm/arch/cpu.h>
 #include "musb_core.h"
 
 /* Base address of MUSB registers */
-#define MENTOR_USB0_BASE (OMAP34XX_CORE_L4_IO_BASE + 0xAB000)
+#define MENTOR_USB0_BASE MUSB_BASE
 
 /* Base address of OTG registers */
 #define OMAP3_OTG_BASE (MENTOR_USB0_BASE + 0x400)