Merge tag 'samsung-dt64-4.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull "Second update of Samsung DeviceTree ARM64 for v4.12" from Krzysztof Kozłowski:

 - Fix DTC warnings in Exynos ARM64 Device Tree sources.
 - Add panel node to TM2E board.

* tag 'samsung-dt64-4.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: dts: exynos: Use - instead of @ for DT OPP entries
  arm64: dts: exynos: Add support for s6e3hf2 panel device on TM2e board

diff --git a/arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi
index c42dc39c32237f69bfa854964bcc19db192923df..ec11343dc5282f32e4ff9410977f89356d1eed35 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi
@@ -94,27 +94,27 @@
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@400000000 {
+               opp-400000000 {
                        opp-hz = /bits/ 64 <400000000>;
                        opp-microvolt = <1075000>;
                };
-               opp@267000000 {
+               opp-267000000 {
                        opp-hz = /bits/ 64 <267000000>;
                        opp-microvolt = <1000000>;
                };
-               opp@200000000 {
+               opp-200000000 {
                        opp-hz = /bits/ 64 <200000000>;
                        opp-microvolt = <975000>;
                };
-               opp@160000000 {
+               opp-160000000 {
                        opp-hz = /bits/ 64 <160000000>;
                        opp-microvolt = <962500>;
                };
-               opp@134000000 {
+               opp-134000000 {
                        opp-hz = /bits/ 64 <134000000>;
                        opp-microvolt = <950000>;
                };
-               opp@100000000 {
+               opp-100000000 {
                        opp-hz = /bits/ 64 <100000000>;
                        opp-microvolt = <937500>;
                };
@@ -123,19 +123,19 @@
        bus_g2d_266_opp_table: opp_table3 {
                compatible = "operating-points-v2";
 
-               opp@267000000 {
+               opp-267000000 {
                        opp-hz = /bits/ 64 <267000000>;
                };
-               opp@200000000 {
+               opp-200000000 {
                        opp-hz = /bits/ 64 <200000000>;
                };
-               opp@160000000 {
+               opp-160000000 {
                        opp-hz = /bits/ 64 <160000000>;
                };
-               opp@134000000 {
+               opp-134000000 {
                        opp-hz = /bits/ 64 <134000000>;
                };
-               opp@100000000 {
+               opp-100000000 {
                        opp-hz = /bits/ 64 <100000000>;
                };
        };
@@ -143,13 +143,13 @@
        bus_gscl_opp_table: opp_table4 {
                compatible = "operating-points-v2";
 
-               opp@333000000 {
+               opp-333000000 {
                        opp-hz = /bits/ 64 <333000000>;
                };
-               opp@222000000 {
+               opp-222000000 {
                        opp-hz = /bits/ 64 <222000000>;
                };
-               opp@166500000 {
+               opp-166500000 {
                        opp-hz = /bits/ 64 <166500000>;
                };
        };
@@ -158,22 +158,22 @@
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@400000000 {
+               opp-400000000 {
                        opp-hz = /bits/ 64 <400000000>;
                };
-               opp@267000000 {
+               opp-267000000 {
                        opp-hz = /bits/ 64 <267000000>;
                };
-               opp@200000000 {
+               opp-200000000 {
                        opp-hz = /bits/ 64 <200000000>;
                };
-               opp@160000000 {
+               opp-160000000 {
                        opp-hz = /bits/ 64 <160000000>;
                };
-               opp@134000000 {
+               opp-134000000 {
                        opp-hz = /bits/ 64 <134000000>;
                };
-               opp@100000000 {
+               opp-100000000 {
                        opp-hz = /bits/ 64 <100000000>;
                };
        };
@@ -181,16 +181,16 @@
        bus_noc2_opp_table: opp_table6 {
                compatible = "operating-points-v2";
 
-               opp@400000000 {
+               opp-400000000 {
                        opp-hz = /bits/ 64 <400000000>;
                };
-               opp@200000000 {
+               opp-200000000 {
                        opp-hz = /bits/ 64 <200000000>;
                };
-               opp@134000000 {
+               opp-134000000 {
                        opp-hz = /bits/ 64 <134000000>;
                };
-               opp@100000000 {
+               opp-100000000 {
                        opp-hz = /bits/ 64 <100000000>;
                };
        };

diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts b/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts
index 694717ade927b5c95022d5393e01efd78eacad2b..b73e1231a86f5563e725873b2f1d02fc661332d6 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts
+++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts
@@ -52,6 +52,17 @@
        assigned-clock-rates = <278000000>, <400000000>;
 };
 
+&dsi {
+       panel@0 {
+               compatible = "samsung,s6e3hf2";
+               reg = <0>;
+               vdd3-supply = <&ldo27_reg>;
+               vci-supply = <&ldo28_reg>;
+               reset-gpios = <&gpg0 0 GPIO_ACTIVE_LOW>;
+               enable-gpios = <&gpf1 5 GPIO_ACTIVE_HIGH>;
+       };
+};
+
 &ldo31_reg {
        regulator-name = "TSP_VDD_1.8V_AP";
        regulator-min-microvolt = <1800000>;

diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
index 16072c1c3ed3eaece9b91049d33a1ffd0ff7156b..727f36abf3d478d1bd2b86fe09fbe535705401ff 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos5433.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
@@ -119,43 +119,43 @@
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@400000000 {
+               opp-400000000 {
                        opp-hz = /bits/ 64 <400000000>;
                        opp-microvolt = <900000>;
                };
-               opp@500000000 {
+               opp-500000000 {
                        opp-hz = /bits/ 64 <500000000>;
                        opp-microvolt = <925000>;
                };
-               opp@600000000 {
+               opp-600000000 {
                        opp-hz = /bits/ 64 <600000000>;
                        opp-microvolt = <950000>;
                };
-               opp@700000000 {
+               opp-700000000 {
                        opp-hz = /bits/ 64 <700000000>;
                        opp-microvolt = <975000>;
                };
-               opp@800000000 {
+               opp-800000000 {
                        opp-hz = /bits/ 64 <800000000>;
                        opp-microvolt = <1000000>;
                };
-               opp@900000000 {
+               opp-900000000 {
                        opp-hz = /bits/ 64 <900000000>;
                        opp-microvolt = <1050000>;
                };
-               opp@1000000000 {
+               opp-1000000000 {
                        opp-hz = /bits/ 64 <1000000000>;
                        opp-microvolt = <1075000>;
                };
-               opp@1100000000 {
+               opp-1100000000 {
                        opp-hz = /bits/ 64 <1100000000>;
                        opp-microvolt = <1112500>;
                };
-               opp@1200000000 {
+               opp-1200000000 {
                        opp-hz = /bits/ 64 <1200000000>;
                        opp-microvolt = <1112500>;
                };
-               opp@1300000000 {
+               opp-1300000000 {
                        opp-hz = /bits/ 64 <1300000000>;
                        opp-microvolt = <1150000>;
                };
@@ -165,63 +165,63 @@
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@500000000 {
+               opp-500000000 {
                        opp-hz = /bits/ 64 <500000000>;
                        opp-microvolt = <900000>;
                };
-               opp@600000000 {
+               opp-600000000 {
                        opp-hz = /bits/ 64 <600000000>;
                        opp-microvolt = <900000>;
                };
-               opp@700000000 {
+               opp-700000000 {
                        opp-hz = /bits/ 64 <700000000>;
                        opp-microvolt = <912500>;
                };
-               opp@800000000 {
+               opp-800000000 {
                        opp-hz = /bits/ 64 <800000000>;
                        opp-microvolt = <912500>;
                };
-               opp@900000000 {
+               opp-900000000 {
                        opp-hz = /bits/ 64 <900000000>;
                        opp-microvolt = <937500>;
                };
-               opp@1000000000 {
+               opp-1000000000 {
                        opp-hz = /bits/ 64 <1000000000>;
                        opp-microvolt = <975000>;
                };
-               opp@1100000000 {
+               opp-1100000000 {
                        opp-hz = /bits/ 64 <1100000000>;
                        opp-microvolt = <1012500>;
                };
-               opp@1200000000 {
+               opp-1200000000 {
                        opp-hz = /bits/ 64 <1200000000>;
                        opp-microvolt = <1037500>;
                };
-               opp@1300000000 {
+               opp-1300000000 {
                        opp-hz = /bits/ 64 <1300000000>;
                        opp-microvolt = <1062500>;
                };
-               opp@1400000000 {
+               opp-1400000000 {
                        opp-hz = /bits/ 64 <1400000000>;
                        opp-microvolt = <1087500>;
                };
-               opp@1500000000 {
+               opp-1500000000 {
                        opp-hz = /bits/ 64 <1500000000>;
                        opp-microvolt = <1125000>;
                };
-               opp@1600000000 {
+               opp-1600000000 {
                        opp-hz = /bits/ 64 <1600000000>;
                        opp-microvolt = <1137500>;
                };
-               opp@1700000000 {
+               opp-1700000000 {
                        opp-hz = /bits/ 64 <1700000000>;
                        opp-microvolt = <1175000>;
                };
-               opp@1800000000 {
+               opp-1800000000 {
                        opp-hz = /bits/ 64 <1800000000>;
                        opp-microvolt = <1212500>;
                };
-               opp@1900000000 {
+               opp-1900000000 {
                        opp-hz = /bits/ 64 <1900000000>;
                        opp-microvolt = <1262500>;
                };