提交 f887605d 编写于 作者: L Laurent Pinchart 提交者: Wolfram Sang

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: NLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: NWolfram Sang <wsa@the-dreams.de>
上级 8c0ec250
...@@ -235,7 +235,7 @@ static void sh_mobile_i2c_init(struct sh_mobile_i2c_data *pd) ...@@ -235,7 +235,7 @@ static void sh_mobile_i2c_init(struct sh_mobile_i2c_data *pd)
int offset; int offset;
/* Get clock rate after clock is enabled */ /* 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 = clk_get_rate(pd->clk) / 1000;
i2c_clk_khz /= pd->clks_per_count; i2c_clk_khz /= pd->clks_per_count;
...@@ -270,14 +270,14 @@ static void sh_mobile_i2c_init(struct sh_mobile_i2c_data *pd) ...@@ -270,14 +270,14 @@ static void sh_mobile_i2c_init(struct sh_mobile_i2c_data *pd)
pd->icic &= ~ICIC_ICCHB8; pd->icic &= ~ICIC_ICCHB8;
out: out:
clk_disable(pd->clk); clk_disable_unprepare(pd->clk);
} }
static void activate_ch(struct sh_mobile_i2c_data *pd) static void activate_ch(struct sh_mobile_i2c_data *pd)
{ {
/* Wake up device and enable clock */ /* Wake up device and enable clock */
pm_runtime_get_sync(pd->dev); pm_runtime_get_sync(pd->dev);
clk_enable(pd->clk); clk_prepare_enable(pd->clk);
/* Enable channel and configure rx ack */ /* Enable channel and configure rx ack */
iic_set_clr(pd, ICCR, ICCR_ICE, 0); iic_set_clr(pd, ICCR, ICCR_ICE, 0);
...@@ -300,7 +300,7 @@ static void deactivate_ch(struct sh_mobile_i2c_data *pd) ...@@ -300,7 +300,7 @@ static void deactivate_ch(struct sh_mobile_i2c_data *pd)
iic_set_clr(pd, ICCR, 0, ICCR_ICE); iic_set_clr(pd, ICCR, 0, ICCR_ICE);
/* Disable clock and mark device as idle */ /* Disable clock and mark device as idle */
clk_disable(pd->clk); clk_disable_unprepare(pd->clk);
pm_runtime_put_sync(pd->dev); pm_runtime_put_sync(pd->dev);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册