Commit bbde6eba authored by Anand Gadiyar's avatar Anand Gadiyar Committed by Kevin Hilman

MUSB: Remove usb_musb_pm_init() call

In usb_musb_pm_init, we attempt to access an MUSB register
when the i-clock may not be on, or the module is otherwise
not accessible.

We need to either:
- enable the clock before this access, or
- remove this code and move it to the bootloader, or
- enable the clock in the bootloader

If we enable the clock in the bootloader, we might as well
add the workaround in the bootloader itself. This code will
anyway be changed once hwmod is in place, so remove it for now

This allows us to boot the kernel on certain OMAP3 boards with
a bootloader that doesn't enable this clock. Without this, we
will need to upgrade the bootloaders on these boards.
Signed-off-by: default avatarAnand Gadiyar <gadiyar@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 24bcadb6
...@@ -31,15 +31,6 @@ ...@@ -31,15 +31,6 @@
#include <mach/mux.h> #include <mach/mux.h>
#include <mach/usb.h> #include <mach/usb.h>
#define OTG_SYSCONFIG (OMAP34XX_HSUSB_OTG_BASE + 0x404)
static void __init usb_musb_pm_init(void)
{
/* Ensure force-idle mode for OTG controller */
if (cpu_is_omap34xx())
omap_writel(0, OTG_SYSCONFIG);
}
#ifdef CONFIG_USB_MUSB_SOC #ifdef CONFIG_USB_MUSB_SOC
static struct resource musb_resources[] = { static struct resource musb_resources[] = {
...@@ -173,13 +164,10 @@ void __init usb_musb_init(void) ...@@ -173,13 +164,10 @@ void __init usb_musb_init(void)
printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n"); printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n");
return; return;
} }
usb_musb_pm_init();
} }
#else #else
void __init usb_musb_init(void) void __init usb_musb_init(void)
{ {
usb_musb_pm_init();
} }
#endif /* CONFIG_USB_MUSB_SOC */ #endif /* CONFIG_USB_MUSB_SOC */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment