usb: musb: core: call init and shutdown for the usb phy

The phy's init routine must be called before it can be used. Do so in
musb_init_controller and the matching shutdown in musb_remove.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 04548423094b8fe7136f8e0eefc763b17cf0e6de..c3791a01ab316dc2773a28c2c53189c635a12f85 100644 (file)
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -2136,6 +2136,10 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
 
        pm_runtime_get_sync(musb->controller);
 
+       status = usb_phy_init(musb->xceiv);
+       if (status < 0)
+               goto err_usb_phy_init;
+
        if (use_dma && dev->dma_mask) {
                musb->dma_controller =
                        musb_dma_controller_create(musb, musb->mregs);
@@ -2256,7 +2260,11 @@ fail3:
        cancel_delayed_work_sync(&musb->deassert_reset_work);
        if (musb->dma_controller)
                musb_dma_controller_destroy(musb->dma_controller);
+
 fail2_5:
+       usb_phy_shutdown(musb->xceiv);
+
+err_usb_phy_init:
        pm_runtime_put_sync(musb->controller);
 
 fail2:
@@ -2317,6 +2325,8 @@ static int musb_remove(struct platform_device *pdev)
        if (musb->dma_controller)
                musb_dma_controller_destroy(musb->dma_controller);
 
+       usb_phy_shutdown(musb->xceiv);
+
        cancel_work_sync(&musb->irq_work);
        cancel_delayed_work_sync(&musb->finish_resume_work);
        cancel_delayed_work_sync(&musb->deassert_reset_work);