2 files changed, 41 insertions, 3 deletions

diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c
index cc0ba68efa55..c65753ffe0f0 100644
--- a/drivers/usb/gadget/r8a66597-udc.c
+++ b/drivers/usb/gadget/r8a66597-udc.c
@@ -25,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
+#include <linux/clk.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
@@ -1475,6 +1476,12 @@ static int __exit r8a66597_remove(struct platform_device *pdev)
         iounmap((void *)r8a66597->reg);
         free_irq(platform_get_irq(pdev, 0), r8a66597);
         r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req);
+#ifdef CONFIG_HAVE_CLK
+        if (r8a66597->pdata->on_chip) {
+                clk_disable(r8a66597->clk);
+                clk_put(r8a66597->clk);
+        }
+#endif
         kfree(r8a66597);
         return 0;
 }
@@ -1485,6 +1492,9 @@ static void nop_completion(struct usb_ep *ep, struct usb_request *r)
 
 static int __init r8a66597_probe(struct platform_device *pdev)
 {
+#ifdef CONFIG_HAVE_CLK
+        char clk_name[8];
+#endif
         struct resource *res, *ires;
         int irq;
         void __iomem *reg = NULL;
@@ -1545,13 +1555,27 @@ static int __init r8a66597_probe(struct platform_device *pdev)
 
         r8a66597->bi_bufnum = R8A66597_BASE_BUFNUM;
 
+#ifdef CONFIG_HAVE_CLK
+        if (r8a66597->pdata->on_chip) {
+                snprintf(clk_name, sizeof(clk_name), "usb%d", pdev->id);
+                r8a66597->clk = clk_get(&pdev->dev, clk_name);
+                if (IS_ERR(r8a66597->clk)) {
+                        dev_err(&pdev->dev, "cannot get clock \"%s\"\n",
+                                clk_name);
+                        ret = PTR_ERR(r8a66597->clk);
+                        goto clean_up;
+                }
+                clk_enable(r8a66597->clk);
+        }
+#endif
+
         disable_controller(r8a66597); /* make sure controller is disabled */
 
         ret = request_irq(irq, r8a66597_irq, IRQF_DISABLED | IRQF_SHARED,
                         udc_name, r8a66597);
         if (ret < 0) {
                 printk(KERN_ERR "request_irq error (%d)\n", ret);
-                goto clean_up;
+                goto clean_up2;
         }
 
         INIT_LIST_HEAD(&r8a66597->gadget.ep_list);
@@ -1586,7 +1610,7 @@ static int __init r8a66597_probe(struct platform_device *pdev)
         r8a66597->ep0_req = r8a66597_alloc_request(&r8a66597->ep[0].ep,
                                                         GFP_KERNEL);
         if (r8a66597->ep0_req == NULL)
-                goto clean_up2;
+                goto clean_up3;
         r8a66597->ep0_req->complete = nop_completion;
 
         init_controller(r8a66597);
@@ -1594,8 +1618,15 @@ static int __init r8a66597_probe(struct platform_device *pdev)
         dev_info(&pdev->dev, "version %s\n", DRIVER_VERSION);
         return 0;
 
-clean_up2:
+clean_up3:
         free_irq(irq, r8a66597);
+clean_up2:
+#ifdef CONFIG_HAVE_CLK
+        if (r8a66597->pdata->on_chip) {
+                clk_disable(r8a66597->clk);
+                clk_put(r8a66597->clk);
+        }
+#endif
 clean_up:
         if (r8a66597) {
                 if (r8a66597->ep0_req)
diff --git a/drivers/usb/gadget/r8a66597-udc.h b/drivers/usb/gadget/r8a66597-udc.h
index a2464bf337c8..7d9a325e7b6d 100644
--- a/drivers/usb/gadget/r8a66597-udc.h
+++ b/drivers/usb/gadget/r8a66597-udc.h
@@ -23,6 +23,10 @@
 #ifndef __R8A66597_H__
 #define __R8A66597_H__
 
+#ifdef CONFIG_HAVE_CLK
+#include <linux/clk.h>
+#endif
+
 #include <linux/usb/r8a66597.h>
 
 #define R8A66597_MAX_SAMPLING   10
@@ -88,6 +92,9 @@ struct r8a66597 {
         spinlock_t              lock;
         unsigned long           reg;
 
+#ifdef CONFIG_HAVE_CLK
+        struct clk *clk;
+#endif
         struct r8a66597_platdata        *pdata;
 
         struct usb_gadget               gadget;