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

Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and
serial.

Conflicts:
	arch/arm/dts/exynos5250.dtsi

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

diff --cc arch/arm/dts/exynos5250.dtsi
index 2d6dfff5917b3747e6ee039e85b84ccd00374f4b,f98243c7a575e37483b779e60b20cc2f56b081c9..4fff5e36942ccead7ebf059861ab7204e33eaaa0
--- 1/arch/arm/dts/exynos5250.dtsi
--- 2/arch/arm/dts/exynos5250.dtsi
+++ b/arch/arm/dts/exynos5250.dtsi
@@@ -202,6 -202,31 +202,34 @@@
                interrupts = <0 78 0>;
        };
  
+       serial@12C00000 {
+               compatible = "samsung,exynos4210-uart";
+               reg = <0x12C00000 0x100>;
+               interrupts = <0 51 0>;
+               id = <0>;
+       };
+ 
+       serial@12C10000 {
+               compatible = "samsung,exynos4210-uart";
+               reg = <0x12C10000 0x100>;
+               interrupts = <0 52 0>;
+               id = <1>;
+       };
+ 
+       serial@12C20000 {
+               compatible = "samsung,exynos4210-uart";
+               reg = <0x12C20000 0x100>;
+               interrupts = <0 53 0>;
+               id = <2>;
+       };
+ 
+       serial@12C30000 {
+               compatible = "samsung,exynos4210-uart";
+               reg = <0x12C30000 0x100>;
+               interrupts = <0 54 0>;
+               id = <3>;
+       };
++
 +      gpio: gpio {
 +      };
  };

diff --cc arch/arm/include/asm/arch-exynos/cpu.h
Simple merge

diff --cc board/samsung/dts/exynos5250-snow.dts
index d2ccc6675d60837b38e60a7675c2503188af62f5,fdc047a1425329c22fce32eb0e594f00f81056b6..dca3386cf2835c869b45d0fedb0b7a9c26952411
--- 1/board/samsung/dts/exynos5250-snow.dts
--- 2/board/samsung/dts/exynos5250-snow.dts
+++ b/board/samsung/dts/exynos5250-snow.dts
@@@ -30,35 -30,14 +30,41 @@@
                spi2 = "/spi@12d40000";
                spi3 = "/spi@131a0000";
                spi4 = "/spi@131b0000";
+               mmc0 = "/mmc@12200000";
+               mmc1 = "/mmc@12210000";
+               mmc2 = "/mmc@12220000";
+               mmc3 = "/mmc@12230000";
+               serial0 = "/serial@12C30000";
+               console = "/serial@12C30000";
        };
  
 +      i2c4: i2c@12ca0000 {
 +              cros-ec@1e {
 +                      reg = <0x1e>;
 +                      compatible = "google,cros-ec";
 +                      i2c-max-frequency = <100000>;
 +                      ec-interrupt = <&gpio 782 1>;
 +              };
 +
 +              power-regulator@48 {
 +                      compatible = "ti,tps65090";
 +                      reg = <0x48>;
 +              };
 +      };
 +
 +      spi@131b0000 {
 +              spi-max-frequency = <1000000>;
 +              spi-deactivate-delay = <100>;
 +              cros-ec@0 {
 +                      reg = <0>;
 +                      compatible = "google,cros-ec";
 +                      spi-max-frequency = <5000000>;
 +                      ec-interrupt = <&gpio 782 1>;
 +                      optimise-flash-write;
 +                      status = "disabled";
 +              };
 +      };
 +
        sound@12d60000 {
                samsung,i2s-epll-clock-frequency = <192000000>;
                samsung,i2s-sampling-rate = <48000>;

diff --cc boards.cfg
Simple merge

diff --cc drivers/spi/mxc_spi.c
Simple merge

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

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

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

diff --cc include/configs/exynos5250-dt.h
index e2a096b6439fc818b357a8e1730a5943b80500dd,b32d1bdb98e338146eff488ae66ef4b0e954df34..582c584ae69625352fdde8a1dd2aa2e88bcebc01
--- 1/include/configs/exynos5250-dt.h
--- 2/include/configs/exynos5250-dt.h
+++ b/include/configs/exynos5250-dt.h
@@@ -86,18 -78,10 +86,18 @@@
  #define CONFIG_SYS_MALLOC_LEN         (CONFIG_ENV_SIZE + (4 << 20))
  
  /* select serial console configuration */
- #define CONFIG_SERIAL3                        /* use SERIAL 3 */
  #define CONFIG_BAUDRATE                       115200
  #define EXYNOS5_DEFAULT_UART_OFFSET   0x010000
+ #define CONFIG_SILENT_CONSOLE
  
 +/* Enable keyboard */
 +#define CONFIG_CROS_EC                /* CROS_EC protocol */
 +#define CONFIG_CROS_EC_SPI            /* Support CROS_EC over SPI */
 +#define CONFIG_CROS_EC_I2C            /* Support CROS_EC over I2C */
 +#define CONFIG_CROS_EC_KEYB   /* CROS_EC keyboard input */
 +#define CONFIG_CMD_CROS_EC
 +#define CONFIG_KEYBOARD
 +
  /* Console configuration */
  #define CONFIG_CONSOLE_MUX
  #define CONFIG_SYS_CONSOLE_IS_IN_ENV

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

diff --cc include/fdtdec.h
Simple merge

diff --cc lib/fdtdec.c
Simple merge