i2c, mxc: rework i2c base address names for different SoCs

rework and unify i2c address names for different SoCs, which
use the mxc_i2c driver.

Signed-off-by: Heiko Schocher <hs@denx.de>

diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index 3e2272b03366ffe79395e71fb837e2222d43edcd..4709ac2bda810b3934a11949e26e5b10bf88e44e 100644 (file)
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -354,6 +354,10 @@ static int i2c_init_transfer(struct mxc_i2c_bus *i2c_bus, u8 chip,
        int ret;
        int reg_shift = i2c_bus->driver_data & I2C_QUIRK_FLAG ?
                        VF610_I2C_REGSHIFT : IMX_I2C_REGSHIFT;
+
+       if (!i2c_bus->base)
+               return -ENODEV;
+
        for (retry = 0; retry < 3; retry++) {
                ret = i2c_init_transfer_(i2c_bus, chip, addr, alen);
                if (ret >= 0)
@@ -512,38 +516,30 @@ static int bus_i2c_write(struct mxc_i2c_bus *i2c_bus, u8 chip, u32 addr,
        return ret;
 }
 
-static struct mxc_i2c_bus mxc_i2c_buses[] = {
-#if defined(CONFIG_SOC_MX25)
-       { 0, IMX_I2C_BASE },
-       { 1, IMX_I2C2_BASE },
-       { 2, IMX_I2C3_BASE },
-#elif defined(CONFIG_SOC_MX27)
-       { 0, IMX_I2C1_BASE },
-       { 1, IMX_I2C2_BASE },
-#elif defined(CONFIG_SOC_MX31) || defined(CONFIG_SOC_MX35) || \
-       defined(CONFIG_SOC_MX51) || defined(CONFIG_SOC_MX53) || \
-       defined(CONFIG_SOC_MX6)
-       { 0, I2C1_BASE_ADDR },
-       { 1, I2C2_BASE_ADDR },
-       { 2, I2C3_BASE_ADDR },
-#if defined(CONFIG_SOC_MX6DL)
-       { 3, I2C4_BASE_ADDR },
+#if !defined(I2C2_BASE_ADDR)
+#define I2C2_BASE_ADDR 0
 #endif
-#elif defined(CONFIG_SOC_LS102XA)
-       { 0, I2C1_BASE_ADDR, I2C_QUIRK_FLAG },
-       { 1, I2C2_BASE_ADDR, I2C_QUIRK_FLAG },
-       { 2, I2C3_BASE_ADDR, I2C_QUIRK_FLAG },
-#elif defined(CONFIG_SOC_VF610)
-       { 0, I2C0_BASE_ADDR, I2C_QUIRK_FLAG },
-#elif defined(CONFIG_FSL_LSCH3)
+
+#if !defined(I2C3_BASE_ADDR)
+#define I2C3_BASE_ADDR 0
+#endif
+
+#if !defined(I2C4_BASE_ADDR)
+#define I2C4_BASE_ADDR 0
+#endif
+
+static struct mxc_i2c_bus mxc_i2c_buses[] = {
+#if defined(CONFIG_SOC_LS102XA) || defined(CONFIG_FSL_LSCH3)
        { 0, I2C1_BASE_ADDR, I2C_QUIRK_FLAG },
        { 1, I2C2_BASE_ADDR, I2C_QUIRK_FLAG },
        { 2, I2C3_BASE_ADDR, I2C_QUIRK_FLAG },
        { 3, I2C4_BASE_ADDR, I2C_QUIRK_FLAG },
 #else
-#error "architecture not supported"
+       { 0, I2C1_BASE_ADDR, 0 },
+       { 1, I2C2_BASE_ADDR, 0 },
+       { 2, I2C3_BASE_ADDR, 0 },
+       { 3, I2C4_BASE_ADDR, 0 },
 #endif
-       { }
 };
 
 struct mxc_i2c_bus *i2c_get_base(struct i2c_adapter *adap)