[U-Boot] [PATCH 17/31] mpc83xx, i2c: add mux support for fsl_i2c

[Heiko Schocher]

Signed-off-by: Heiko Schocher <hs at denx.de>
---
 drivers/i2c/fsl_i2c.c |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index ce646fd..5242884 100644
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -42,6 +42,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #define CONFIG_SYS_SPD_BUS_NUM 0
 #endif
 static unsigned int i2c_bus_num __attribute__ ((section (".data"))) = CONFIG_SYS_SPD_BUS_NUM;
+static unsigned int i2c_bus_num_mux __attribute__ ((section ("data"))) = 0;

 static unsigned int i2c_bus_speed[2] = {CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SPEED};

@@ -369,6 +370,23 @@ i2c_probe(uchar chip)

 int i2c_set_bus_num(unsigned int bus)
 {
+#if defined(CONFIG_I2C_MUX)
+	if (bus < CONFIG_SYS_MAX_I2C_BUS) {
+		i2c_bus_num = bus;
+	} else {
+		int	ret;
+
+		ret = i2x_mux_select_mux(bus);
+		if (ret == 0) {
+			/* with CONFIG_I2C_MUX only I2C Controller 1
+			 * is usable
+			 */
+			i2c_bus_num = 0;
+			i2c_bus_num_mux = bus;
+		} else
+			return ret;
+	}
+#else
 #ifdef CONFIG_SYS_I2C2_OFFSET
 	if (bus > 1) {
 #else
@@ -378,7 +396,7 @@ int i2c_set_bus_num(unsigned int bus)
 	}

 	i2c_bus_num = bus;
-
+#endif
 	return 0;
 }

@@ -396,7 +414,11 @@ int i2c_set_bus_speed(unsigned int speed)

 unsigned int i2c_get_bus_num(void)
 {
+#if defined(CONFIG_I2C_MUX)
+	return i2c_bus_num_mux;
+#else
 	return i2c_bus_num;
+#endif
 }

 unsigned int i2c_get_bus_speed(void)
-- 
1.6.0.6

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany