diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-12-20 20:23:08 +0100 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-12-20 20:23:31 +0100 |
| commit | ddf20397eb1672bdbdc1d96d06f2f683ac76094f (patch) | |
| tree | 84f50355012501b1077f10603cd700770c9c5b6d /drivers | |
| parent | Merge tag 's3c64xx-dmaengine' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | usb: r8a66597-hcd: Convert to clk_prepare/unprepare (diff) | |
| download | linux-ddf20397eb1672bdbdc1d96d06f2f683ac76094f.tar.xz linux-ddf20397eb1672bdbdc1d96d06f2f683ac76094f.zip | |
Merge tag 'renesas-usb-r8a66597-hcd-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers
From Simon Horman:
Renesas USB r8a66597 HCD update for v3.14
Convert to clk_prepare/unprepare
* tag 'renesas-usb-r8a66597-hcd-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
usb: r8a66597-hcd: Convert to clk_prepare/unprepare
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/host/r8a66597-hcd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c index 2ad004ae747c..a2fdd85e0c91 100644 --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c @@ -95,7 +95,7 @@ static int r8a66597_clock_enable(struct r8a66597 *r8a66597) int i = 0; if (r8a66597->pdata->on_chip) { - clk_enable(r8a66597->clk); + clk_prepare_enable(r8a66597->clk); do { r8a66597_write(r8a66597, SCKE, SYSCFG0); tmp = r8a66597_read(r8a66597, SYSCFG0); @@ -139,7 +139,7 @@ static void r8a66597_clock_disable(struct r8a66597 *r8a66597) udelay(1); if (r8a66597->pdata->on_chip) { - clk_disable(r8a66597->clk); + clk_disable_unprepare(r8a66597->clk); } else { r8a66597_bclr(r8a66597, PLLC, SYSCFG0); r8a66597_bclr(r8a66597, XCKE, SYSCFG0); |