| From bf13ce07d60de51545eb44fbae163ac831937985 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Mon, 28 Oct 2013 23:49:23 +0100 |
| Subject: i2c: sh_mobile: 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. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Signed-off-by: Wolfram Sang <wsa@the-dreams.de> |
| (cherry picked from commit f887605d25c1514b06b1a0e0477f85f27f23664d) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/i2c/busses/i2c-sh_mobile.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c |
| index debf745c0268..10a83ca6f8ca 100644 |
| --- a/drivers/i2c/busses/i2c-sh_mobile.c |
| +++ b/drivers/i2c/busses/i2c-sh_mobile.c |
| @@ -236,7 +236,7 @@ static void sh_mobile_i2c_init(struct sh_mobile_i2c_data *pd) |
| int offset; |
| |
| /* Get clock rate after clock is enabled */ |
| - clk_enable(pd->clk); |
| + clk_prepare_enable(pd->clk); |
| i2c_clk_khz = clk_get_rate(pd->clk) / 1000; |
| i2c_clk_khz /= pd->clks_per_count; |
| |
| @@ -271,14 +271,14 @@ static void sh_mobile_i2c_init(struct sh_mobile_i2c_data *pd) |
| pd->icic &= ~ICIC_ICCHB8; |
| |
| out: |
| - clk_disable(pd->clk); |
| + clk_disable_unprepare(pd->clk); |
| } |
| |
| static void activate_ch(struct sh_mobile_i2c_data *pd) |
| { |
| /* Wake up device and enable clock */ |
| pm_runtime_get_sync(pd->dev); |
| - clk_enable(pd->clk); |
| + clk_prepare_enable(pd->clk); |
| |
| /* Enable channel and configure rx ack */ |
| iic_set_clr(pd, ICCR, ICCR_ICE, 0); |
| @@ -301,7 +301,7 @@ static void deactivate_ch(struct sh_mobile_i2c_data *pd) |
| iic_set_clr(pd, ICCR, 0, ICCR_ICE); |
| |
| /* Disable clock and mark device as idle */ |
| - clk_disable(pd->clk); |
| + clk_disable_unprepare(pd->clk); |
| pm_runtime_put_sync(pd->dev); |
| } |
| |
| -- |
| 1.8.5.rc3 |
| |