]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
i2c: imx: add clk_prepare/clk_unprepare
authorRichard Zhao <richard.zhao@linaro.org>
Tue, 15 Nov 2011 06:48:08 +0000 (14:48 +0800)
committerSascha Hauer <s.hauer@pengutronix.de>
Wed, 1 Feb 2012 13:29:31 +0000 (14:29 +0100)
It's for migrating to generic clk framework API.

Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
drivers/i2c/busses/i2c-imx.c

index 58832e578fff24dbbff08b38eb82e093a2cf36df..8d1ab6fa88e1b6b0cc351eee7793253ed55f354b 100644 (file)
@@ -196,7 +196,7 @@ static int i2c_imx_start(struct imx_i2c_struct *i2c_imx)
 
        dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__);
 
-       clk_enable(i2c_imx->clk);
+       clk_prepare_enable(i2c_imx->clk);
        writeb(i2c_imx->ifdr, i2c_imx->base + IMX_I2C_IFDR);
        /* Enable I2C controller */
        writeb(0, i2c_imx->base + IMX_I2C_I2SR);
@@ -245,7 +245,7 @@ static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx)
 
        /* Disable I2C controller */
        writeb(0, i2c_imx->base + IMX_I2C_I2CR);
-       clk_disable(i2c_imx->clk);
+       clk_disable_unprepare(i2c_imx->clk);
 }
 
 static void __init i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx,