Merge branch 'v4.1-next/dt-samsung' into for-next

diff --cc arch/arm/boot/dts/exynos3250.dtsi
Simple merge

diff --cc arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index adb4f6a97a1d5b19d67d486e7d36dd386884d1fd,3c5a7ab23c6bf11504ca1b96d49c68673d0fef68..8de12af7c276f427c7a8901b5411326b5fd8f20e
--- 1/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
--- 2/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@@ -425,53 -419,14 +433,59 @@@
        ehci: ehci@12580000 {
                status = "okay";
        };
 +
 +      tmu@100C0000 {
 +              vtmu-supply = <&ldo10_reg>;
 +              status = "okay";
 +      };
 +
 +      thermal-zones {
 +              cpu_thermal: cpu-thermal {
 +                      cooling-maps {
 +                              map0 {
 +                                   /* Corresponds to 800MHz at freq_table */
 +                                   cooling-device = <&cpu0 7 7>;
 +                              };
 +                              map1 {
 +                                   /* Corresponds to 200MHz at freq_table */
 +                                   cooling-device = <&cpu0 13 13>;
 +                             };
 +                     };
 +              };
 +      };
 +
 +      mixer: mixer@12C10000 {
 +              status = "okay";
 +      };
 +
 +      hdmi@12D00000 {
 +              hpd-gpio = <&gpx3 7 0>;
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&hdmi_hpd>;
 +              vdd-supply = <&ldo8_reg>;
 +              vdd_osc-supply = <&ldo10_reg>;
 +              vdd_pll-supply = <&ldo8_reg>;
 +              ddc = <&hdmi_ddc>;
 +              status = "okay";
 +      };
 +
 +      hdmi_ddc: i2c@13880000 {
 +              status = "okay";
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&i2c2_bus>;
 +      };
 +
 +      i2c@138E0000 {
 +              status = "okay";
 +      };
  };
  
+ /* RSTN signal for eMMC */
+ &sd1_cd {
+       samsung,pin-pud = <0>;
+       samsung,pin-drv = <0>;
+ };
+ 
  &pinctrl_1 {
        gpio_power_key: power_key {
                samsung,pins = "gpx1-3";