diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-08-10 22:20:51 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-08-10 22:20:51 +0200 |
| commit | 9844d027b52cc89264f6bf7686e26d9dc50134fd (patch) | |
| tree | e1e89eeab5e44dc91fe3a4a3a497f1d1e178f925 /drivers/usb/musb/omap3.c | |
| parent | 201532a69cf7e7a84bff354fdab45947425d22b4 (diff) | |
| parent | 1b03eede4fed47c6af7df84b0f7b621ff3e3bb40 (diff) | |
| download | u-boot-imx-9844d027b52cc89264f6bf7686e26d9dc50134fd.zip u-boot-imx-9844d027b52cc89264f6bf7686e26d9dc50134fd.tar.gz u-boot-imx-9844d027b52cc89264f6bf7686e26d9dc50134fd.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ti
Diffstat (limited to 'drivers/usb/musb/omap3.c')
| -rw-r--r-- | drivers/usb/musb/omap3.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/usb/musb/omap3.c b/drivers/usb/musb/omap3.c index a983552..c7876ed 100644 --- 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; } |