usb: dwc2: gadget: move phy control calls out of pullup() method

This patch moves phy enable/disable calls from pullup() method to
udc_start/stop functions. This solves the issue related to limited caller
context for PHY functions, because they cannot be called from non-sleeping
context. This is also a preparation for using soft-disconnect feature of
udc controller in pullup() method.

Acked-by: Paul Zimmerman <paulz@synopsys.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 5109936c4f3398cd2639c9a1908747f5c1882c4f..68865e5f759b2c5747db8902c98dbe9c3186a66a 100644 (file)
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -2916,6 +2916,8 @@ static int s3c_hsotg_udc_start(struct usb_gadget *gadget,
                goto err;
        }
 
+       s3c_hsotg_phy_enable(hsotg);
+
        dev_info(hsotg->dev, "bound driver %s\n", driver->driver.name);
        return 0;
 
@@ -2951,6 +2953,8 @@ static int s3c_hsotg_udc_stop(struct usb_gadget *gadget)
 
        spin_unlock_irqrestore(&hsotg->lock, flags);
 
+       s3c_hsotg_phy_disable(hsotg);
+
        regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);
 
        clk_disable(hsotg->clk);
@@ -2985,13 +2989,11 @@ static int s3c_hsotg_pullup(struct usb_gadget *gadget, int is_on)
 
        spin_lock_irqsave(&hsotg->lock, flags);
        if (is_on) {
-               s3c_hsotg_phy_enable(hsotg);
                clk_enable(hsotg->clk);
                s3c_hsotg_core_init_disconnected(hsotg);
                s3c_hsotg_core_connect(hsotg);
        } else {
                clk_disable(hsotg->clk);
-               s3c_hsotg_phy_disable(hsotg);
        }
 
        hsotg->gadget.speed = USB_SPEED_UNKNOWN;