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

Conflicts:
	board/samsung/trats2/trats2.c
	include/configs/exynos5250-dt.h

Signed-off-by: Tom Rini <trini@ti.com>

diff --cc Makefile
Simple merge

diff --cc README
Simple merge

diff --cc board/samsung/trats/trats.c
Simple merge

diff --cc board/samsung/trats2/trats2.c
index 8df85ee39640b70a9ee9e800eba000b47cfc90f2,9552522001cc84a77235fba532b6685ecfebf58c..147de179cc60accfc785aeb9e4f60c1f6b77f2bc
--- 1/board/samsung/trats2/trats2.c
--- 2/board/samsung/trats2/trats2.c
+++ b/board/samsung/trats2/trats2.c
@@@ -115,17 -118,12 +118,17 @@@ static void board_external_gpio_init(vo
  #ifdef CONFIG_SYS_I2C_INIT_BOARD
  static void board_init_i2c(void)
  {
-       gpio1 = (struct exynos4x12_gpio_part1 *)EXYNOS4X12_GPIO_PART1_BASE;
-       gpio2 = (struct exynos4x12_gpio_part2 *)EXYNOS4X12_GPIO_PART2_BASE;
 +      int err;
 +
+       gpio1 = (struct exynos4x12_gpio_part1 *)samsung_get_base_gpio_part1();
+       gpio2 = (struct exynos4x12_gpio_part2 *)samsung_get_base_gpio_part2();
  
        /* I2C_7 */
 -      s5p_gpio_direction_output(&gpio1->d0, 2, 1);
 -      s5p_gpio_direction_output(&gpio1->d0, 3, 1);
 +      err = exynos_pinmux_config(PERIPH_ID_I2C7, PINMUX_FLAG_NONE);
 +      if (err) {
 +              debug("I2C%d not configured\n", (I2C_7));
 +              return;
 +      }
  
        /* I2C_8 */
        s5p_gpio_direction_output(&gpio1->f1, 4, 1);

diff --cc include/configs/arndale.h
Simple merge

diff --cc include/configs/exynos5250-dt.h
Simple merge

diff --cc include/configs/trats.h
Simple merge

diff --cc include/configs/trats2.h
Simple merge