Merge branch 'master' of http://git.denx.de/u-boot-samsung

[u-boot] / drivers / usb / musb / omap3.c

diff --git a/drivers/usb/musb/omap3.c b/drivers/usb/musb/omap3.c
index ea98c3cac172efe82037cfb84a9bdcf5f65a9cef..97da529b44e99d30c7267d47b3f161e50697a749 100644 (file)
--- a/drivers/usb/musb/omap3.c
+++ b/drivers/usb/musb/omap3.c
@@ -14,31 +14,20 @@
  *
  * ------------------------------------------------------------------------
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
+#include <asm/omap_common.h>
 #include <twl4030.h>
+#include <twl6030.h>
 #include "omap3.h"
 
 static int platform_needs_initialization = 1;
 
 struct musb_config musb_cfg = {
-       (struct musb_regs *)MENTOR_USB0_BASE,
-       OMAP3_USB_TIMEOUT,
-       0
+       .regs           = (struct musb_regs *)MENTOR_USB0_BASE,
+       .timeout        = OMAP3_USB_TIMEOUT,
+       .musb_speed     = 0,
 };
 
 /*
@@ -65,7 +54,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 +99,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 */
@@ -119,11 +118,23 @@ int musb_platform_init(void)
                stdby &= ~OMAP3_OTG_FORCESTDBY_STANDBY;
                writel(stdby, &otg->forcestdby);
 
+#ifdef CONFIG_OMAP3_EVM
+               musb_cfg.extvbus = omap3_evm_need_extvbus();
+#endif
+
+#ifdef CONFIG_OMAP4430
+               u32 *usbotghs_control =
+                       (u32 *)((*ctrl)->control_usbotghs_ctrl);
+               *usbotghs_control = 0x15;
+#endif
                platform_needs_initialization = 0;
        }
 
        ret = platform_needs_initialization;
+
+#ifdef CONFIG_TWL4030_USB
 end:
+#endif
        return ret;
 
 }