Merge branch 'next/dt-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene...

From Kukjin Kim:

Here is Samsung DT for v3.8 and this is including DT for EXYNOS4X12
SoC, SMDK4412 board, pinctrl for exynos4x12, TMU, MFC, SATA and SATA
PHY.

As I commented on [4/7], this branch merged pinctrl/samsung to support
pinctrl for exynos4x12 without useless merge conflicts.

* 'next/dt-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (32 commits)
  ARM: EXYNOS: DT Support for SATA and SATA PHY
  ARM: dts: Remove broken-voltage property from sdhci node for exynos4210-trats
  ARM: dts: Add node for touchscreen for exynos4210-trats
  ARM: dts: Add node for touchscreen voltage regulator for exynos4210-trats
  ARM: dts: Add node for i2c3 bus for exynos4210-trats
  ARM: dts: Add nodes for GPIO keys available on Trats
  ARM: dts: Update for pinctrl-samsung driver for exynos4210-trats
  ARM: dts: Add nodes for pin controllers for exynos4x12
  pinctrl: samsung: Add support for EXYNOS4X12
  gpio: samsung: Skip registration if pinctrl driver is present on EXYNOS4X12
  ARM: EXYNOS: Skip wakeup-int setup if pinctrl driver is used on EXYNOS4X12
  ARM: dts: add board dts file for EXYNOS4412 based SMDK board
  ARM: dts: Add support for EXYNOS4X12 SoCs
  ARM: EXYNOS: Add devicetree node for TMU driver for exynos5
  ARM: EXYNOS: Add devicetree node for TMU driver for exynos4
  ARM: EXYNOS: Add MFC device tree support
  ARM: dts: Enable serial controllers on Origen and SMDKV310
  Documentation: Update samsung-pinctrl device tree bindings documentation
  pinctrl: samsung: Add GPIO to IRQ translation
  pinctrl: exynos: Set pin function to EINT in irq_set_type of wake-up EINT
  ...

Add/add conflicts in:
	arch/arm/boot/dts/exynos5250-smdk5250.dts
	arch/arm/boot/dts/exynos5250.dtsi
	arch/arm/mach-exynos/mach-exynos5-dt.c

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/exynos5250-smdk5250.dts
index 7212d53,3f8c2ab..29f1333
--- 1/arch/arm/boot/dts/exynos5250-smdk5250.dts
--- 2/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@@ -55,16 -55,23 +55,31 @@@
                };
        };
  
+       i2c@121D0000 {
+               samsung,i2c-sda-delay = <100>;
+               samsung,i2c-max-bus-freq = <40000>;
+               samsung,i2c-slave-addr = <0x38>;
+ 
+               sata-phy {
+                       compatible = "samsung,sata-phy";
+                       reg = <0x38>;
+               };
+       };
+ 
+       sata@122F0000 {
+               samsung,sata-freq = <66>;
+       };
+ 
        i2c@12C80000 {
 -              status = "disabled";
 +              samsung,i2c-sda-delay = <100>;
 +              samsung,i2c-max-bus-freq = <66000>;
 +              gpios = <&gpa0 6 3 3 0>,
 +                      <&gpa0 7 3 3 0>;
 +
 +              hdmiddc@50 {
 +                      compatible = "samsung,exynos5-hdmiddc";
 +                      reg = <0x50>;
 +              };
        };
  
        i2c@12C90000 {
@@@ -185,7 -182,8 +200,12 @@@
                status = "disabled";
        };
  
 +      hdmi {
 +              hpd-gpio = <&gpx3 7 0xf 1 3>;
 +      };
++
+       codec@11000000 {
+               samsung,mfc-r = <0x43000000 0x800000>;
+               samsung,mfc-l = <0x51000000 0x800000>;
+       };
  };

diff --cc arch/arm/boot/dts/exynos5250.dtsi
index 190068f,e913525..b82b829
--- 1/arch/arm/boot/dts/exynos5250.dtsi
--- 2/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@@ -156,12 -179,11 +179,19 @@@
                #size-cells = <0>;
        };
  
 +      i2c@12CE0000 {
 +              compatible = "samsung,s3c2440-hdmiphy-i2c";
 +              reg = <0x12CE0000 0x1000>;
 +              interrupts = <0 64 0>;
 +              #address-cells = <1>;
 +              #size-cells = <0>;
++      };
++
+       i2c@121D0000 {
+                 compatible = "samsung,exynos5-sata-phy-i2c";
+                 reg = <0x121D0000 0x100>;
+                 #address-cells = <1>;
+                 #size-cells = <0>;
        };
  
        spi_0: spi@12d20000 {

diff --cc arch/arm/mach-exynos/clock-exynos5.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-exynos5-dt.c
index db03537,a88c19f..28146f2
--- 1/arch/arm/mach-exynos/mach-exynos5-dt.c
--- 2/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@@ -76,10 -81,9 +85,13 @@@ static const struct of_dev_auxdata exyn
                                "exynos-gsc.2", NULL),
        OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC3,
                                "exynos-gsc.3", NULL),
 +      OF_DEV_AUXDATA("samsung,exynos5-hdmi", 0x14530000,
 +                              "exynos5-hdmi", NULL),
 +      OF_DEV_AUXDATA("samsung,exynos5-mixer", 0x14450000,
 +                              "exynos5-mixer", NULL),
+       OF_DEV_AUXDATA("samsung,mfc-v6", 0x11000000, "s5p-mfc-v6", NULL),
+       OF_DEV_AUXDATA("samsung,exynos5250-tmu", 0x10060000,
+                               "exynos-tmu", NULL),
        {},
  };