I2C: mxc: fix compilation for MX31

[oweals/u-boot.git] / drivers / i2c / mxc_i2c.c

diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index c5ec486a7b8a8eb912b0480125d2aedb57fed1f6..ebde3c5ab253ca9fdb52f7ed0fa6652d3c2c5524 100644 (file)
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -27,13 +27,8 @@
 
 #if defined(CONFIG_HARD_I2C)
 
-#if defined(CONFIG_MX31)
-#include <asm/arch/mx31.h>
-#include <asm/arch/mx31-regs.h>
-#else
-#include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
-#endif
+#include <asm/arch/imx-regs.h>
 
 #define IADR   0x00
 #define IFDR   0x04
@@ -94,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)