USB: MUSB: Be sure that we enable musb->clock

If CONFIG_OMAP_RESET_CLOCKS is enabled, musb->clock would
be disabled because nobody was enabling it.

Be sure that omap2430.c enables musb->clock to avoid problems
later.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 8041ddecec419f79807b2278e80be15444f78a51..c21d93ac7e478de057dab5afe8d7e7a0d9da9ea6 100644 (file)
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -246,6 +246,9 @@ int __init musb_platform_init(struct musb *musb)
 
 int musb_platform_suspend(struct musb *musb)
 {
+       if (!musb->clock)
+               return 0;
+
        /* in any role */
        OTG_FORCESTDBY_REG &= ~ENABLEFORCE; /* disable MSTANDBY */
        OTG_SYSCONFIG_REG &= FORCESTDBY;        /* enable force standby */
@@ -257,14 +260,27 @@ int musb_platform_suspend(struct musb *musb)
        if (musb->xceiv.set_suspend)
                musb->xceiv.set_suspend(&musb->xceiv, 1);
 
+       if (musb->set_clock)
+               musb->set_clock(musb->clock, 0);
+       else
+               clk_disable(musb->clock);
+
        return 0;
 }
 
 int musb_platform_resume(struct musb *musb)
 {
+       if (!musb->clock)
+               return 0;
+
        if (musb->xceiv.set_suspend)
                musb->xceiv.set_suspend(&musb->xceiv, 0);
 
+       if (musb->set_clock)
+               musb->set_clock(musb->clock, 1);
+       else
+               clk_enable(musb->clock);
+
        OTG_FORCESTDBY_REG &= ~ENABLEFORCE; /* disable MSTANDBY */
        OTG_SYSCONFIG_REG |= SMARTSTDBY;        /* enable smart standby */
        OTG_SYSCONFIG_REG &= ~AUTOIDLE;         /* disable auto idle */