]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
usb: dwc2: remove non-functional clock gating
authorMarek Szyprowski <m.szyprowski@samsung.com>
Mon, 21 Sep 2015 10:16:10 +0000 (12:16 +0200)
committerFelipe Balbi <balbi@ti.com>
Thu, 1 Oct 2015 17:40:28 +0000 (12:40 -0500)
During typical gadget operation, dwc2 clock was enabled 3 times: from
dwc2_gadget_init(), dwc2_hsotg_udc_start() and dwc2_hsotg_pullup(), and
then disabled in s3c_hsotg_pullup(), s3c_hsotg_udc_stop() and
dwc2_hsotg_remove(). This really makes no sense, so leave clock control
code only in dwc2_gadget_init/remove functions.

Tested-by: John Youn <johnyoun@synopsys.com>
Acked-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/dwc2/gadget.c

index 7afd04cf64b1cf1a0454e1d5b7d8f533f5fac8a6..19202c1c79ff84da8af5b3df799e172c927c94c3 100644 (file)
@@ -3146,8 +3146,6 @@ static int dwc2_hsotg_udc_start(struct usb_gadget *gadget,
        hsotg->gadget.dev.of_node = hsotg->dev->of_node;
        hsotg->gadget.speed = USB_SPEED_UNKNOWN;
 
-       clk_enable(hsotg->clk);
-
        ret = regulator_bulk_enable(ARRAY_SIZE(hsotg->supplies),
                                    hsotg->supplies);
        if (ret) {
@@ -3217,8 +3215,6 @@ static int dwc2_hsotg_udc_stop(struct usb_gadget *gadget)
 
        regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);
 
-       clk_disable(hsotg->clk);
-
        mutex_unlock(&hsotg->init_mutex);
 
        return 0;
@@ -3259,7 +3255,6 @@ static int dwc2_hsotg_pullup(struct usb_gadget *gadget, int is_on)
        mutex_lock(&hsotg->init_mutex);
        spin_lock_irqsave(&hsotg->lock, flags);
        if (is_on) {
-               clk_enable(hsotg->clk);
                hsotg->enabled = 1;
                dwc2_hsotg_core_init_disconnected(hsotg, false);
                dwc2_hsotg_core_connect(hsotg);
@@ -3267,7 +3262,6 @@ static int dwc2_hsotg_pullup(struct usb_gadget *gadget, int is_on)
                dwc2_hsotg_core_disconnect(hsotg);
                dwc2_hsotg_disconnect(hsotg);
                hsotg->enabled = 0;
-               clk_disable(hsotg->clk);
        }
 
        hsotg->gadget.speed = USB_SPEED_UNKNOWN;