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

From Kukjin Kim:
Here is second Samsung DT stuff for v3.8.

This is including power domain DT support for exynos and Google ARM
Chromebook, Snow board and exynos4210-origen updates.

* 'next/dt-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: dts: Use drive strength 3 for SD pins for exynos4
  ARM: dts: Set up power domains for exynos4
  ARM: EXYNOS: Bind devices to power domains using DT
  ARM: EXYNOS: Fix power domain name initialization
  ARM: EXYNOS: Detect power domain state on registration from DT
  ARM: dts: Add vmmc fixed voltage regulator for exynos4210-origen
  ARM: dts: Update sdhci nodes for current bindings for exynos4210-origen
  ARM: dts: Update for pinctrl-samsung driver for exynos4210-origen
  ARM: dts: Split memory sections for exynos4210-origen
  ARM: EXYNOS: add all i2c busses to auxdata for DT
  ARM: dts: Add aliases for i2c controller for exynos4
  ARM: dts: Add board dts file for Snow board (ARM Chromebook)
  ARM: dts: Move the dwmmc aliases from smdk5250 dts to exynos

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

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

diff --combined arch/arm/boot/dts/Makefile
index 83faa72dc1764d60af2683d70e5c5ffe8b5ce09a,e70cd372a6771ee7f4858274e55c47b70422fa79..a31211904e91479b4a8ff965af5547c38712ce7b
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -17,8 -17,6 +17,8 @@@ dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb 
        usb_a9263.dtb \
        usb_a9g20.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
 +dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
 +      da850-evm.dtb
  dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \
        dove-cubox.dtb \
        dove-dove-db.dtb
@@@ -26,7 -24,8 +26,8 @@@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210
        exynos4210-smdkv310.dtb \
        exynos4210-trats.dtb \
        exynos4412-smdk4412.dtb \
-       exynos5250-smdk5250.dtb
+       exynos5250-smdk5250.dtb \
+       exynos5250-snow.dtb
  dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb
  dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
        integratorcp.dtb
@@@ -54,33 -53,27 +55,33 @@@ dtb-$(CONFIG_ARCH_MXC) += imx51-babbage
        imx53-qsb.dtb \
        imx53-smd.dtb \
        imx6q-arm2.dtb \
 +      imx6q-sabreauto.dtb \
        imx6q-sabrelite.dtb \
        imx6q-sabresd.dtb
  dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
        imx23-olinuxino.dtb \
        imx23-stmp378x_devb.dtb \
 +      imx28-apf28.dtb \
 +      imx28-apf28dev.dtb \
        imx28-apx4devkit.dtb \
        imx28-cfa10036.dtb \
        imx28-cfa10049.dtb \
        imx28-evk.dtb \
        imx28-m28evk.dtb \
 +      imx28-sps1.dtb \
        imx28-tx28.dtb
  dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
 +      omap3-beagle.dtb \
        omap3-beagle-xm.dtb \
        omap3-evm.dtb \
        omap3-tobi.dtb \
        omap4-panda.dtb \
 -      omap4-pandaES.dtb \
 -      omap4-var_som.dtb \
 +      omap4-panda-es.dtb \
 +      omap4-var-som.dtb \
        omap4-sdp.dtb \
        omap5-evm.dtb \
        am335x-evm.dtb \
 +      am335x-evmsk.dtb \
        am335x-bone.dtb
  dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
  dtb-$(CONFIG_ARCH_U8500) += snowball.dtb
@@@ -112,6 -105,5 +113,6 @@@ dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress
  dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
        wm8505-ref.dtb \
        wm8650-mid.dtb
 +dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb
  
  endif

diff --combined arch/arm/boot/dts/exynos5250-smdk5250.dts
index 29f133371c1125bfef0db8e3148f7106cc5a99ce,371182fc2c5070e55d8edbd65e409abda154d7af..942d5761ca971dd7317c8398d5ddaddd0b0fce98
--- 1/arch/arm/boot/dts/exynos5250-smdk5250.dts
--- 2/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@@ -17,10 -17,6 +17,6 @@@
        compatible = "samsung,smdk5250", "samsung,exynos5250";
  
        aliases {
-               mshc0 = &dwmmc_0;
-               mshc1 = &dwmmc_1;
-               mshc2 = &dwmmc_2;
-               mshc3 = &dwmmc_3;
        };
  
        memory {
@@@ -71,15 -67,7 +67,15 @@@
        };
  
        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 {
@@@ -102,17 -90,7 +98,17 @@@
                status = "disabled";
        };
  
-       dwmmc_0: dwmmc0@12200000 {
 +      i2c@12CE0000 {
 +              samsung,i2c-sda-delay = <100>;
 +              samsung,i2c-max-bus-freq = <66000>;
 +
 +              hdmiphy@38 {
 +                      compatible = "samsung,exynos5-hdmiphy";
 +                      reg = <0x38>;
 +              };
 +      };
 +
+       dwmmc0@12200000 {
                num-slots = <1>;
                supports-highspeed;
                broken-cd;
@@@ -133,11 -111,11 +129,11 @@@
                };
        };
  
-       dwmmc_1: dwmmc1@12210000 {
+       dwmmc1@12210000 {
                status = "disabled";
        };
  
-       dwmmc_2: dwmmc2@12220000 {
+       dwmmc2@12220000 {
                num-slots = <1>;
                supports-highspeed;
                fifo-depth = <0x80>;
@@@ -158,7 -136,7 +154,7 @@@
                };
        };
  
-       dwmmc_3: dwmmc3@12230000 {
+       dwmmc3@12230000 {
                status = "disabled";
        };
  
@@@ -200,10 -178,6 +196,10 @@@
                status = "disabled";
        };
  
 +      hdmi {
 +              hpd-gpio = <&gpx3 7 0xf 1 3>;
 +      };
 +
        codec@11000000 {
                samsung,mfc-r = <0x43000000 0x800000>;
                samsung,mfc-l = <0x51000000 0x800000>;

diff --combined arch/arm/boot/dts/exynos5250.dtsi
index b82b829171ae0723707570c5b93c0a53034232f3,71a3e0b45444e06827bc568e66e77ffeafb4530a..36d8246ea50eaef5e5cae9c719b8ade854a17bd1
--- 1/arch/arm/boot/dts/exynos5250.dtsi
--- 2/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@@ -31,6 -31,10 +31,10 @@@
                gsc1 = &gsc_1;
                gsc2 = &gsc_2;
                gsc3 = &gsc_3;
+               mshc0 = &dwmmc_0;
+               mshc1 = &dwmmc_1;
+               mshc2 = &dwmmc_2;
+               mshc3 = &dwmmc_3;
        };
  
        gic:interrupt-controller@10481000 {
@@@ -179,14 -183,6 +183,14 @@@
                #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>;
@@@ -224,7 -220,7 +228,7 @@@
                #size-cells = <0>;
        };
  
-       dwmmc0@12200000 {
+       dwmmc_0: dwmmc0@12200000 {
                compatible = "samsung,exynos5250-dw-mshc";
                reg = <0x12200000 0x1000>;
                interrupts = <0 75 0>;
@@@ -232,7 -228,7 +236,7 @@@
                #size-cells = <0>;
        };
  
-       dwmmc1@12210000 {
+       dwmmc_1: dwmmc1@12210000 {
                compatible = "samsung,exynos5250-dw-mshc";
                reg = <0x12210000 0x1000>;
                interrupts = <0 76 0>;
@@@ -240,7 -236,7 +244,7 @@@
                #size-cells = <0>;
        };
  
-       dwmmc2@12220000 {
+       dwmmc_2: dwmmc2@12220000 {
                compatible = "samsung,exynos5250-dw-mshc";
                reg = <0x12220000 0x1000>;
                interrupts = <0 77 0>;
@@@ -248,7 -244,7 +252,7 @@@
                #size-cells = <0>;
        };
  
-       dwmmc3@12230000 {
+       dwmmc_3: dwmmc3@12230000 {
                compatible = "samsung,exynos5250-dw-mshc";
                reg = <0x12230000 0x1000>;
                interrupts = <0 78 0>;
@@@ -558,16 -554,4 +562,16 @@@
                reg = <0x13e30000 0x1000>;
                interrupts = <0 88 0>;
        };
 +
 +      hdmi {
 +              compatible = "samsung,exynos5-hdmi";
 +              reg = <0x14530000 0x100000>;
 +              interrupts = <0 95 0>;
 +      };
 +
 +      mixer {
 +              compatible = "samsung,exynos5-mixer";
 +              reg = <0x14450000 0x10000>;
 +              interrupts = <0 94 0>;
 +      };
  };

diff --combined arch/arm/mach-exynos/mach-exynos5-dt.c
index 28146f2f71dc2ddd4579cb459a57b9779be74487,a032678d8018bc08e50c416b2ea7ea082e0ccf0d..25f464cf7979c10e434ec3181668730c8ed17ea1
--- 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
@@@ -50,10 -50,16 +50,20 @@@ static const struct of_dev_auxdata exyn
                                "s3c2440-i2c.0", NULL),
        OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(1),
                                "s3c2440-i2c.1", NULL),
 +      OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(2),
 +                              "s3c2440-i2c.2", NULL),
+       OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(3),
+                               "s3c2440-i2c.3", NULL),
+       OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(4),
+                               "s3c2440-i2c.4", NULL),
+       OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(5),
+                               "s3c2440-i2c.5", NULL),
+       OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(6),
+                               "s3c2440-i2c.6", NULL),
+       OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(7),
+                               "s3c2440-i2c.7", NULL),
 +      OF_DEV_AUXDATA("samsung,s3c2440-hdmiphy-i2c", EXYNOS5_PA_IIC(8),
 +                              "s3c2440-hdmiphy-i2c", NULL),
        OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI0,
                                "dw_mmc.0", NULL),
        OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI1,
@@@ -85,10 -91,6 +95,10 @@@
                                "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),