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

Merge "Samsung DT updates for v4.1" from Kukjin Kim:

- for exynos3250
  : add assigned clock parents for CMU nodes

- for exynos4412-odroid
  : add eMMC reset line

- for exynos5250
  : fixed typo for interrupt-cells

- for exynos5250-snow
  : define stdout-path property
  : represent bridge and panel connection
  : enable wifi power-on and add cap-sdio-irq to wifi mmc node

- for exynos5250-spring
  : define stdout-path property

- for exynos5420
  : fixed typo for interrupt-cells
  : add async-bridge clocks for gsc and disp1 PDs

- for exynos5420 boards
  : Mux XMMCnDATA[0] pad correctly

- for exynos5420-odroidxu3
  : add eMMC reset line

- for Peach boards
  : add HS400 support and define stdout-path property
  : add mclk entry and add WiFi module support
  : represent bridge and panel connection

* tag 'samsung-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: dts: Fixed typo interrupt-cells for exynos5420 and exynos5250
  ARM: dts: Add HS400 support for exynos5420 and exynos5800
  ARM: dts: add async-bridge clocks to gsc power domain for exynos5420
  ARM: dts: add async-bridge clocks to disp1 power domain for exynos5420
  dt-bindings: add asynchronous bridge clock for exynos
  ARM: dts: Define stdout-path property for exynos5250-spring
  ARM: dts: Define stdout-path property for exynos5250-snow
  ARM: dts: Define stdout-path property for Peach boards
  ARM: dts: Add assigned clock parents to CMU node for exynos3250
  ARM: dts: Add mclk entry for Peach boards
  ARM: dts: Add WiFi module support for Peach boards
  ARM: dts: Mux XMMCnDATA[0] pad correctly for Exynos5420 boards
  ARM: dts: add eMMC reset line for exynos5422-odroidxu3
  ARM: dts: add eMMC reset line for exynos4412-odroid-common
  ARM: dts: represent bridge and panel connection for exynos5420-peach-pit
  ARM: dts: represent bridge and panel connection for exynos5250-snow
  ARM: dts: Add cap-sdio-irq to wifi mmc node for exynos5250-snow
  ARM: dts: Enable wifi power-on for exynos5250-snow

Signed-off-by: Olof Johansson <[email protected]>

diff --cc Documentation/devicetree/bindings/arm/exynos/power_domain.txt
index 1e097037349c326a22e3f07abb3e3aca9d78d0ce,c47e79be460511ac31916ae77d3465600e3aedbc..5da38c5ed476ee2248432314c0bf886305f6cc13
--- 1/Documentation/devicetree/bindings/arm/exynos/power_domain.txt
--- 2/Documentation/devicetree/bindings/arm/exynos/power_domain.txt
+++ b/Documentation/devicetree/bindings/arm/exynos/power_domain.txt
@@@ -22,8 -22,9 +22,11 @@@ Optional Properties
        - pclkN, clkN: Pairs of parent of input clock and input clock to the
                devices in this power domain. Maximum of 4 pairs (N = 0 to 3)
                are supported currently.
+       - asbN: Clocks required by asynchronous bridges (ASB) present in
+               the power domain. These clock should be enabled during power
+               domain on/off operations.
 +- power-domains: phandle pointing to the parent power domain, for more details
 +               see Documentation/devicetree/bindings/power/power_domain.txt
  
  Node of a device using power domains must have a power-domains property
  defined with a phandle to respective power domain.

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

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

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