Merge remote-tracking branch 'u-boot-sh/rmobile'

[u-boot] / board / samsung / common / multi_i2c.c

diff --git a/board/samsung/common/multi_i2c.c b/board/samsung/common/multi_i2c.c
index 4fce987540d150f0fa9b56f181deb6a6c89a5194..71c32c0b6ebcb90b2afe065362aa323b632959ca 100644 (file)
--- a/board/samsung/common/multi_i2c.c
+++ b/board/samsung/common/multi_i2c.c
@@ -8,17 +8,26 @@
 #include <common.h>
 #include <i2c.h>
 
+#ifndef CONFIG_SOFT_I2C_I2C10_SCL
+#define CONFIG_SOFT_I2C_I2C10_SCL 0
+#endif
+
+#ifndef CONFIG_SOFT_I2C_I2C10_SDA
+#define CONFIG_SOFT_I2C_I2C10_SDA 0
+#endif
+
 /* Handle multiple I2C buses instances */
 int get_multi_scl_pin(void)
 {
-       unsigned int bus = I2C_GET_BUS();
+       unsigned int bus = i2c_get_bus_num();
 
        switch (bus) {
-       case I2C_0: /* I2C_0 definition - compatibility layer */
-       case I2C_5:
+       case I2C_0:
                return CONFIG_SOFT_I2C_I2C5_SCL;
-       case I2C_9:
+       case I2C_1:
                return CONFIG_SOFT_I2C_I2C9_SCL;
+       case I2C_2:
+               return CONFIG_SOFT_I2C_I2C10_SCL;
        default:
                printf("I2C_%d not supported!\n", bus);
        };
@@ -28,14 +37,15 @@ int get_multi_scl_pin(void)
 
 int get_multi_sda_pin(void)
 {
-       unsigned int bus = I2C_GET_BUS();
+       unsigned int bus = i2c_get_bus_num();
 
        switch (bus) {
-       case I2C_0: /* I2C_0 definition - compatibility layer */
-       case I2C_5:
+       case I2C_0:
                return CONFIG_SOFT_I2C_I2C5_SDA;
-       case I2C_9:
+       case I2C_1:
                return CONFIG_SOFT_I2C_I2C9_SDA;
+       case I2C_2:
+               return CONFIG_SOFT_I2C_I2C10_SDA;
        default:
                printf("I2C_%d not supported!\n", bus);
        };