summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
c414424)
Add support for the clock framework to the r8a66597 gadget driver.
This is needed to control the clock driving the USB block.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/platform_device.h>
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/platform_device.h>
#include <linux/usb/ch9.h>
#include <linux/usb/gadget.h>
#include <linux/usb/ch9.h>
#include <linux/usb/gadget.h>
iounmap((void *)r8a66597->reg);
free_irq(platform_get_irq(pdev, 0), r8a66597);
r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req);
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;
}
kfree(r8a66597);
return 0;
}
static int __init r8a66597_probe(struct platform_device *pdev)
{
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;
struct resource *res, *ires;
int irq;
void __iomem *reg = NULL;
r8a66597->bi_bufnum = R8A66597_BASE_BUFNUM;
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);
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);
}
INIT_LIST_HEAD(&r8a66597->gadget.ep_list);
}
INIT_LIST_HEAD(&r8a66597->gadget.ep_list);
r8a66597->ep0_req = r8a66597_alloc_request(&r8a66597->ep[0].ep,
GFP_KERNEL);
if (r8a66597->ep0_req == NULL)
r8a66597->ep0_req = r8a66597_alloc_request(&r8a66597->ep[0].ep,
GFP_KERNEL);
if (r8a66597->ep0_req == NULL)
r8a66597->ep0_req->complete = nop_completion;
init_controller(r8a66597);
r8a66597->ep0_req->complete = nop_completion;
init_controller(r8a66597);
dev_info(&pdev->dev, "version %s\n", DRIVER_VERSION);
return 0;
dev_info(&pdev->dev, "version %s\n", DRIVER_VERSION);
return 0;
+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)
clean_up:
if (r8a66597) {
if (r8a66597->ep0_req)
#ifndef __R8A66597_H__
#define __R8A66597_H__
#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
#include <linux/usb/r8a66597.h>
#define R8A66597_MAX_SAMPLING 10
spinlock_t lock;
unsigned long reg;
spinlock_t lock;
unsigned long reg;
+#ifdef CONFIG_HAVE_CLK
+ struct clk *clk;
+#endif
struct r8a66597_platdata *pdata;
struct usb_gadget gadget;
struct r8a66597_platdata *pdata;
struct usb_gadget gadget;