]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
mx51: Fix I2C clock ID check
authorBenoît Thébaudeau <benoit.thebaudeau@advansee.com>
Thu, 27 Sep 2012 10:24:13 +0000 (10:24 +0000)
committerTom Rini <trini@ti.com>
Mon, 15 Oct 2012 18:54:12 +0000 (11:54 -0700)
There are only 2 I²C instances on i.MX51, but 3 on i.MX53.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Cc: Stefano Babic <sbabic@denx.de>
arch/arm/cpu/armv7/mx5/clock.c

index a59b88a490b74009720c2bc91881317432b01448..46983ff33f2f3f8ce11d2506e8d7ca8e53ace683 100644 (file)
@@ -111,12 +111,16 @@ void enable_usboh3_clk(unsigned char enable)
 }
 
 #ifdef CONFIG_I2C_MXC
-/* i2c_num can be from 0 - 2 */
+/* i2c_num can be from 0, to 1 for i.MX51 and 2 for i.MX53 */
 int enable_i2c_clk(unsigned char enable, unsigned i2c_num)
 {
        u32 mask;
 
+#if defined(CONFIG_MX51)
+       if (i2c_num > 1)
+#elif defined(CONFIG_MX53)
        if (i2c_num > 2)
+#endif
                return -EINVAL;
        mask = MXC_CCM_CCGR_CG_MASK <<
                        (MXC_CCM_CCGR1_I2C1_OFFSET + (i2c_num << 1));