common: Make sure arch-specific map_sysmem() is defined

[karo-tx-uboot.git] / drivers / i2c / mxc_i2c.c

diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index da55c6b9b7420ad3fc08ea58400b6beb1220490f..ee86ea06efd4b90a0333119c680ae247a2975b0c 100644 (file)
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -168,6 +168,9 @@ static int bus_i2c_set_bus_speed(void *base, int speed)
        u8 clk_idx = i2c_imx_get_clk(speed);
        u8 idx = i2c_clk_div[clk_idx][1];
 
+       if (!base)
+               return -ENODEV;
+
        /* Store divider value */
        writeb(idx, &i2c_regs->ifdr);
 
@@ -330,6 +333,9 @@ int bus_i2c_read(void *base, uchar chip, uint addr, int alen, uchar *buf,
        int i;
        struct mxc_i2c_regs *i2c_regs = (struct mxc_i2c_regs *)base;
 
+       if (!base)
+               return -ENODEV;
+
        ret = i2c_init_transfer(i2c_regs, chip, addr, alen);
        if (ret < 0)
                return ret;
@@ -389,6 +395,9 @@ int bus_i2c_write(void *base, uchar chip, uint addr, int alen,
        int i;
        struct mxc_i2c_regs *i2c_regs = (struct mxc_i2c_regs *)base;
 
+       if (!base)
+               return -ENODEV;
+
        ret = i2c_init_transfer(i2c_regs, chip, addr, alen);
        if (ret < 0)
                return ret;
@@ -402,30 +411,23 @@ int bus_i2c_write(void *base, uchar chip, uint addr, int alen,
        return ret;
 }
 
+#if !defined(I2C2_BASE_ADDR)
+#define I2C2_BASE_ADDR NULL
+#endif
+
+#if !defined(I2C3_BASE_ADDR)
+#define I2C3_BASE_ADDR NULL
+#endif
+
+#if !defined(I2C4_BASE_ADDR)
+#define I2C4_BASE_ADDR NULL
+#endif
+
 static void * const i2c_bases[] = {
-#if defined(CONFIG_SOC_MX25)
-       (void *)IMX_I2C_BASE,
-       (void *)IMX_I2C2_BASE,
-       (void *)IMX_I2C3_BASE
-#elif defined(CONFIG_SOC_MX27)
-       (void *)IMX_I2C1_BASE,
-       (void *)IMX_I2C2_BASE
-#elif defined(CONFIG_SOC_MX31) || defined(CONFIG_SOC_MX35) || \
-       defined(CONFIG_SOC_MX51) || defined(CONFIG_SOC_MX53) || \
-       defined(CONFIG_SOC_MX6) || defined(CONFIG_SOC_LS102XA)
-       (void *)I2C1_BASE_ADDR,
-       (void *)I2C2_BASE_ADDR,
-       (void *)I2C3_BASE_ADDR
-#elif defined(CONFIG_SOC_VF610)
-       (void *)I2C0_BASE_ADDR
-#elif defined(CONFIG_FSL_LSCH3)
        (void *)I2C1_BASE_ADDR,
        (void *)I2C2_BASE_ADDR,
        (void *)I2C3_BASE_ADDR,
        (void *)I2C4_BASE_ADDR
-#else
-#error "architecture not supported"
-#endif
 };
 
 struct i2c_parms {