From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH] i2c-imx: Add missing preporcessor directives
Date: Fri, 14 Aug 2015 19:45:51 -0700 [thread overview]
Message-ID: <1439606751-15327-1-git-send-email-andrew.smirnov@gmail.com> (raw)
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@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);
else
i2c_fsl_set_clk(i2c_fsl, FSL_I2C_BIT_RATE);
+#endif
/* Set up chip registers to defaults */
writeb(0, i2c_fsl->base + FSL_I2C_I2CR);
--
2.1.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2015-08-15 2:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-15 2:45 Andrey Smirnov [this message]
2015-08-15 7:25 ` Sam Ravnborg
2015-08-15 15:48 ` Andrey Smirnov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1439606751-15327-1-git-send-email-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox