arm: socfpga: spl: Add support for booting from QSPI

[karo-tx-uboot.git] / arch / arm / imx-common / i2c-mxv7.c

diff --git a/arch/arm/imx-common/i2c-mxv7.c b/arch/arm/imx-common/i2c-mxv7.c
index 33205fbb5f227fa30b88a093f02a3e1033e846f5..ff72b1a1fc8101984ae50ea39a46a5dc342a04fe 100644 (file)
--- a/arch/arm/imx-common/i2c-mxv7.c
+++ b/arch/arm/imx-common/i2c-mxv7.c
@@ -12,7 +12,7 @@
 #include <asm/imx-common/mxc_i2c.h>
 #include <watchdog.h>
 
-static int force_idle_bus(void *priv)
+int force_idle_bus(void *priv)
 {
        int i;
        int sda, scl;
@@ -102,8 +102,9 @@ int setup_i2c(unsigned i2c_index, int speed, int slave_addr,
        if (ret)
                goto err_idle;
 
-       bus_i2c_init(i2c_bases[i2c_index], speed, slave_addr,
-                       force_idle_bus, p);
+#ifndef CONFIG_DM_I2C
+       bus_i2c_init(i2c_index, speed, slave_addr, force_idle_bus, p);
+#endif
 
        return 0;