Skip to contentSkip to conversation

usb: gadget: pxa25x_udc: prepare/unprepare clocks in pxa-ssp

PATCH New Dmitry Eremin-Solenikov 2 participants 4 messages Nov 15, 2014

Subsystems (2)
USB PXA2xx/PXA3xx support
lore
Share & tools
lore

Dmitry Eremin-Solenikov

author
#0 lore raw

PATCH 1/2 usb: gadget: pxa25x_udc: prepare/unprepare clocks in pxa-ssp

Change clk_enable/disable() calls to clk_prepare_enable() and clk_disable_unrepapre().

Signed-off-by Dmitry Eremin-Solenikov <[email protected]>
---
 drivers/usb/gadget/udc/pxa25x_udc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/usb/gadget/udc/pxa25x_udc.c +4 -4
index 42f7eeb..e4964ee 100644
@@ -103,8 +103,8 @@ static const char ep0name [] = "ep0";
 
 /* IXP doesn't yet support <linux/clk.h> */
 #define clk_get(dev,name)	NULL
-#define clk_enable(clk)		do { } while (0)
-#define clk_disable(clk)	do { } while (0)
+#define clk_prepare_enable(clk)	do { } while (0)
+#define clk_disable_unprepare(clk)	do { } while (0)
 #define clk_put(clk)		do { } while (0)
 
 #endif

@@ -932,7 +932,7 @@ static int pullup(struct pxa25x_udc *udc)
 		if (!udc->active) {
 			udc->active = 1;
 			/* Enable clock for USB device */
-			clk_enable(udc->clk);
+			clk_prepare_enable(udc->clk);
 			udc_enable(udc);
 		}
 	} else {

@@ -945,7 +945,7 @@ static int pullup(struct pxa25x_udc *udc)
 			}
 			udc_disable(udc);
 			/* Disable clock for USB device */
-			clk_disable(udc->clk);
+			clk_disable_unprepare(udc->clk);
 			udc->active = 0;
 		}
Signature · 1 line
2.1.1
author
#1 lore raw

PATCH 2/2 usb: gadget: pxa27x_udc: prepare/unprepare clocks in pxa-ssp

Change clk_enable/disable() calls to clk_prepare_enable() and clk_disable_unrepapre().

Signed-off-by Dmitry Eremin-Solenikov <[email protected]>
---
 drivers/usb/gadget/udc/pxa27x_udc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/gadget/udc/pxa27x_udc.c +2 -2
index 4868369..e03c61d 100644
@@ -1701,7 +1701,7 @@ static void udc_disable(struct pxa_udc *udc)
 	udc_writel(udc, UDCICR1, 0);
 
 	udc_clear_mask_UDCCR(udc, UDCCR_UDE);
-	clk_disable(udc->clk);
+	clk_disable_unprepare(udc->clk);
 
 	ep0_idle(udc);
 	udc->gadget.speed = USB_SPEED_UNKNOWN;

@@ -1761,7 +1761,7 @@ static void udc_enable(struct pxa_udc *udc)
 	udc_writel(udc, UDCICR1, 0);
 	udc_clear_mask_UDCCR(udc, UDCCR_UDE);
 
-	clk_enable(udc->clk);
+	clk_prepare_enable(udc->clk);
 
 	ep0_idle(udc);
 	udc->gadget.speed = USB_SPEED_FULL;
Signature · 1 line
2.1.1
maintainer
#2 lore raw

PATCH 2/2 usb: gadget: pxa27x_udc: prepare/unprepare clocks in pxa-ssp

Quoted 2 lines · Dmitry Eremin-Solenikov

Change clk_enable/disable() calls to clk_prepare_enable() and clk_disable_unrepapre().

No, there are already patches for this in Felipe's next tree :
git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git testing/next

Cheers.

--
Robert

maintainer
#3 lore raw

PATCH 1/2 usb: gadget: pxa25x_udc: prepare/unprepare clocks in pxa-ssp

In reply to Dmitry Eremin-Solenikov
Quoted 2 lines · Dmitry Eremin-Solenikov

Change clk_enable/disable() calls to clk_prepare_enable() and clk_disable_unrepapre().

=> clk_disable_unprepare() (typo)

Otherwise, good for me, ack.

Cheers.

--
Robert