Anand Gadiyar <[email protected]> writes: > 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: Anand Gadiyar <[email protected]>
NAK. The PM branch already has a fix from Jon Hunter[1] for this which enables the clock, and in the thread where we discussed this I mentioned I would carry it in the PM branch until the hwmod for OTG is ready. Kevin [1] http://marc.info/?l=linux-omap&m=125020202601759&w=2 > arch/arm/mach-omap2/usb-musb.c | 12 ------------ > 1 files changed, 12 deletions(-) > > Index: linux-2.6/arch/arm/mach-omap2/usb-musb.c > =================================================================== > --- linux-2.6.orig/arch/arm/mach-omap2/usb-musb.c > +++ linux-2.6/arch/arm/mach-omap2/usb-musb.c > @@ -31,15 +31,6 @@ > #include <mach/mux.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 > > static struct resource musb_resources[] = { > @@ -194,13 +185,10 @@ void __init usb_musb_init(void) > printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n"); > return; > } > - > - usb_musb_pm_init(); > } > > #else > void __init usb_musb_init(void) > { > - usb_musb_pm_init(); > } > #endif /* CONFIG_USB_MUSB_SOC */ > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to [email protected] > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
