summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2011-08-30 00:51:14 +0000
committerWolfgang Denk <wd@denx.de>2011-09-07 22:11:47 +0200
commit30032710ed7259800cc4dbcba8741fef65e56186 (patch)
treede1e9de019427840847e62f7b3443787cc5f973d /drivers
parent67f463b06d00701b955ea4ac176fc96a8ecd416f (diff)
downloadblackbird-obmc-uboot-30032710ed7259800cc4dbcba8741fef65e56186.tar.gz
blackbird-obmc-uboot-30032710ed7259800cc4dbcba8741fef65e56186.zip
I2C: mxc: fix compilation for MX31
Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Heiko Schocher <hs@denx.de> Acked-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/mxc_i2c.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index 89d1973bf5..ebde3c5ab2 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -89,14 +89,11 @@ void i2c_init(int speed, int unused)
#if defined(CONFIG_MX31)
struct clock_control_regs *sc_regs =
(struct clock_control_regs *)CCM_BASE;
-
- freq = mx31_get_ipg_clk();
/* start the required I2C clock */
writel(readl(&sc_regs->cgr0) | (3 << I2C_CLK_OFFSET),
&sc_regs->cgr0);
-#else
- freq = mxc_get_clock(MXC_IPG_PERCLK);
#endif
+ freq = mxc_get_clock(MXC_IPG_PERCLK);
for (i = 0; i < 0x1f; i++)
if (freq / div[i] <= speed)
OpenPOWER on IntegriCloud