Merge branch 'master' of git://git.denx.de/u-boot-i2c

diff --combined include/configs/trats.h
index 794b6fb79318b1d52eed0868f02bfa67c0893b7b,66ef377afe63d38b4d2cd41306a59301fcbb9be1..b3b5a3d5e31a0faaf8ecffb911bbcef80ec8cfee
--- 1/include/configs/trats.h
--- 2/include/configs/trats.h
+++ b/include/configs/trats.h
@@@ -78,7 -78,6 +78,7 @@@
  #define CONFIG_MMC
  #define CONFIG_S5P_SDHCI
  #define CONFIG_SDHCI
 +#define CONFIG_MMC_SDMA
  
  /* PWM */
  #define CONFIG_PWM
@@@ -212,18 -211,28 +212,28 @@@
  #define CONFIG_SYS_INIT_SP_ADDR       (CONFIG_SYS_LOAD_ADDR - GENERATED_GBL_DATA_SIZE)
  #define CONFIG_SYS_CACHELINE_SIZE       32
  
- #include <asm/arch/gpio.h>
- /*
-  * I2C Settings
-  */
- #define CONFIG_SOFT_I2C_GPIO_SCL exynos4_gpio_part1_get_nr(b, 7)
- #define CONFIG_SOFT_I2C_GPIO_SDA exynos4_gpio_part1_get_nr(b, 6)
  
  #define CONFIG_SOFT_I2C
  #define CONFIG_SOFT_I2C_READ_REPEATED_START
+ #define CONFIG_SYS_I2C_INIT_BOARD
  #define CONFIG_SYS_I2C_SPEED  50000
  #define CONFIG_I2C_MULTI_BUS
- #define CONFIG_SYS_MAX_I2C_BUS        7
+ #define CONFIG_SOFT_I2C_MULTI_BUS
+ #define CONFIG_SYS_MAX_I2C_BUS        15
+ 
+ #include <asm/arch/gpio.h>
+ 
+ /* I2C PMIC */
+ #define CONFIG_SOFT_I2C_I2C5_SCL exynos4_gpio_part1_get_nr(b, 7)
+ #define CONFIG_SOFT_I2C_I2C5_SDA exynos4_gpio_part1_get_nr(b, 6)
+ 
+ /* I2C FG */
+ #define CONFIG_SOFT_I2C_I2C9_SCL exynos4_gpio_part2_get_nr(y4, 1)
+ #define CONFIG_SOFT_I2C_I2C9_SDA exynos4_gpio_part2_get_nr(y4, 0)
+ 
+ #define CONFIG_SOFT_I2C_GPIO_SCL get_multi_scl_pin()
+ #define CONFIG_SOFT_I2C_GPIO_SDA get_multi_sda_pin()
+ #define I2C_INIT multi_i2c_init()
  
  #define CONFIG_PMIC
  #define CONFIG_PMIC_I2C