diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-28 19:32:38 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-04 17:49:44 +0200 |
| commit | 93fbc1ce222f8111130e7cd244ec92b1c226991c (patch) | |
| tree | be97dda6bfad04a5ea9e2a7f5c4fb604e3759d76 /drivers/i2c/busses/i2c-imx.c | |
| parent | 269ca0edeb1e94f688bbe5c09ff48999f18fc33b (diff) | |
| download | barebox-93fbc1ce222f8111130e7cd244ec92b1c226991c.tar.gz barebox-93fbc1ce222f8111130e7cd244ec92b1c226991c.tar.xz | |
i2c i.MX: fixup clock support for powerpc
This produced a warning on powerpc since the conversion to common clk support
on i.MX.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/i2c/busses/i2c-imx.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-imx.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 24bbc6b7cc..a1012a784e 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -110,19 +110,6 @@ struct fsl_i2c_struct { }; #define to_fsl_i2c_struct(a) container_of(a, struct fsl_i2c_struct, adapter) -#ifdef CONFIG_COMMON_CLK -static inline unsigned long i2c_fsl_clk_get_rate(struct fsl_i2c_struct *i2c_fsl) -{ - return clk_get_rate(i2c_fsl->clk); -} - -#else -static inline unsigned long i2c_fsl_clk_get_rate(struct fsl_i2c_struct *i2c_fsl) -{ - return fsl_get_i2cclk(); -} -#endif - #ifdef CONFIG_I2C_DEBUG static void i2c_fsl_dump_reg(struct i2c_adapter *adapter) { @@ -358,7 +345,7 @@ static void i2c_fsl_set_clk(struct fsl_i2c_struct *i2c_fsl, int i; /* Divider value calculation */ - i2c_clk_rate = i2c_fsl_clk_get_rate(i2c_fsl); + i2c_clk_rate = clk_get_rate(i2c_fsl->clk); div = (i2c_clk_rate + rate - 1) / rate; if (div < i2c_clk_div[0][0]) i = 0; |