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 021b2fe511d26c9e35b617c60a35d8725e1f3d07..ee86ea06efd4b90a0333119c680ae247a2975b0c 100644 (file)
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -135,7 +135,7 @@ static uint8_t i2c_imx_get_clk(unsigned int rate)
        unsigned int div;
        u8 clk_div;
 
-#if defined(CONFIG_MX31)
+#if defined(CONFIG_SOC_MX31)
        struct clock_control_regs *sc_regs =
                (struct clock_control_regs *)CCM_BASE;
 
@@ -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,6 +411,25 @@ 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[] = {
+       (void *)I2C1_BASE_ADDR,
+       (void *)I2C2_BASE_ADDR,
+       (void *)I2C3_BASE_ADDR,
+       (void *)I2C4_BASE_ADDR
+};
+
 struct i2c_parms {
        void *base;
        void *idle_bus_data;
@@ -410,33 +438,7 @@ struct i2c_parms {
 
 struct sram_data {
        unsigned curr_i2c_bus;
-       struct i2c_parms i2c_data[3];
-};
-
-static void * const i2c_bases[] = {
-#if defined(CONFIG_MX25)
-       (void *)IMX_I2C_BASE,
-       (void *)IMX_I2C2_BASE,
-       (void *)IMX_I2C3_BASE
-#elif defined(CONFIG_MX27)
-       (void *)IMX_I2C1_BASE,
-       (void *)IMX_I2C2_BASE
-#elif defined(CONFIG_MX31) || defined(CONFIG_MX35) || \
-       defined(CONFIG_MX51) || defined(CONFIG_MX53) || \
-       defined(CONFIG_MX6) || defined(CONFIG_LS102XA)
-       (void *)I2C1_BASE_ADDR,
-       (void *)I2C2_BASE_ADDR,
-       (void *)I2C3_BASE_ADDR
-#elif defined(CONFIG_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 i2c_data[ARRAY_SIZE(i2c_bases)];
 };
 
 void *i2c_get_base(struct i2c_adapter *adap)
@@ -543,9 +545,9 @@ U_BOOT_I2C_ADAP_COMPLETE(mxc1, mxc_i2c_init, mxc_i2c_probe,
                         mxc_i2c_set_bus_speed,
                         CONFIG_SYS_MXC_I2C2_SPEED,
                         CONFIG_SYS_MXC_I2C2_SLAVE, 1)
-#if defined(CONFIG_MX31) || defined(CONFIG_MX35) ||\
-       defined(CONFIG_MX51) || defined(CONFIG_MX53) ||\
-       defined(CONFIG_MX6) || defined(CONFIG_LS102XA)
+#if defined(CONFIG_SOC_MX31) || defined(CONFIG_SOC_MX35) ||\
+       defined(CONFIG_SOC_MX51) || defined(CONFIG_SOC_MX53) ||\
+       defined(CONFIG_SOC_MX6) || defined(CONFIG_SOC_LS102XA)
 U_BOOT_I2C_ADAP_COMPLETE(mxc2, mxc_i2c_init, mxc_i2c_probe,
                         mxc_i2c_read, mxc_i2c_write,
                         mxc_i2c_set_bus_speed,