aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/r8a66597-hcd.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2013-10-28 18:49:27 -0400
committerSimon Horman <horms+renesas@verge.net.au>2013-11-28 03:19:11 -0500
commit9b547a882e9ffec67bb41a4e66b4bcc0e91a2737 (patch)
tree89905d56ecbca49eacd2a27710bbda16ab1324da /drivers/usb/host/r8a66597-hcd.c
parent6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff)
usb: r8a66597-hcd: Convert to clk_prepare/unprepare
Turn clk_enable() and clk_disable() calls into clk_prepare_enable() and clk_disable_unprepare() to get ready for the migration to the common clock framework. Cc: linux-usb@vger.kernel.org Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'drivers/usb/host/r8a66597-hcd.c')
-rw-r--r--drivers/usb/host/r8a66597-hcd.c4
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)
95 int i = 0; 95 int i = 0;
96 96
97 if (r8a66597->pdata->on_chip) { 97 if (r8a66597->pdata->on_chip) {
98 clk_enable(r8a66597->clk); 98 clk_prepare_enable(r8a66597->clk);
99 do { 99 do {
100 r8a66597_write(r8a66597, SCKE, SYSCFG0); 100 r8a66597_write(r8a66597, SCKE, SYSCFG0);
101 tmp = r8a66597_read(r8a66597, SYSCFG0); 101 tmp = r8a66597_read(r8a66597, SYSCFG0);
@@ -139,7 +139,7 @@ static void r8a66597_clock_disable(struct r8a66597 *r8a66597)
139 udelay(1); 139 udelay(1);
140 140
141 if (r8a66597->pdata->on_chip) { 141 if (r8a66597->pdata->on_chip) {
142 clk_disable(r8a66597->clk); 142 clk_disable_unprepare(r8a66597->clk);
143 } else { 143 } else {
144 r8a66597_bclr(r8a66597, PLLC, SYSCFG0); 144 r8a66597_bclr(r8a66597, PLLC, SYSCFG0);
145 r8a66597_bclr(r8a66597, XCKE, SYSCFG0); 145 r8a66597_bclr(r8a66597, XCKE, SYSCFG0);