[PATCH] i2c-imx: Add missing preporcessor directives

Andrey Smirnov andrew.smirnov at gmail.com
Fri Aug 14 19:45:51 PDT 2015

On non-PowerPC platforms call to i2c_fsl_set_clk() will try to obtain
I2C clock freqency from i2c_fsl->clk, however that field would not be
initialized if CONFIG_COMMON_CLK is not set. This patch add
conditional compilation directives to make sure that i2c_fsl_set_clk()
is not called if CONFIG_COMMON_CLK is not set.

Signed-off-by: Andrey Smirnov <andrew.smirnov at gmail.com>
 drivers/i2c/busses/i2c-imx.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index 4cd03e1..4abb710 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -557,11 +557,13 @@ static int __init i2c_fsl_probe(struct device_d *pdev)

 	i2c_fsl->dfsrr = -1;

+#if defined(CONFIG_COMMON_CLK) || defined(CONFIG_PPC)
 	/* Set up clock divider */
 	if (pdata && pdata->bitrate)
 		i2c_fsl_set_clk(i2c_fsl, pdata->bitrate);
 		i2c_fsl_set_clk(i2c_fsl, FSL_I2C_BIT_RATE);

 	/* Set up chip registers to defaults */
 	writeb(0, i2c_fsl->base + FSL_I2C_I2CR);

More information about the barebox mailing list