From: Tom Rini <trini@ti.com>
Date: Tue, 10 Dec 2013 22:15:18 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-arm
X-Git-Tag: v2014.01-rc2~42
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=4b210ad34282bfd9fc982a8e3c9a9126f4094cdb

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>
---

4b210ad34282bfd9fc982a8e3c9a9126f4094cdb
diff --cc board/samsung/trats2/trats2.c
index 8df85ee396,9552522001..147de179cc
--- a/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)
  {
 +	int err;
 +
- 	gpio1 = (struct exynos4x12_gpio_part1 *)EXYNOS4X12_GPIO_PART1_BASE;
- 	gpio2 = (struct exynos4x12_gpio_part2 *)EXYNOS4X12_GPIO_PART2_BASE;
+ 	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);