ARM: dts: exynos: Use - instead of @ for DT OPP entries

Compiling the DT file with W=1, DTC warns like follows:

Warning (unit_address_vs_reg): Node /opp_table0/opp@1000000000 has a
unit name, but no reg property

Fix this by replacing '@' with '-' as the OPP nodes will never have a
"reg" property.

Reported-by: Krzysztof Kozlowski <krzk@kernel.org>
Reported-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Suggested-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Rob Herring <robh@kernel.org>
[k.kozlowski: Split patch per ARM and ARM64]
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/Documentation/devicetree/bindings/devfreq/exynos-bus.txt b/Documentation/devicetree/bindings/devfreq/exynos-bus.txt
index d085ef90d27c1f8b82645177169f71c3eb42d00f..f8e946471a58d7bb6ac07d22cf6a876d8c509410 100644 (file)
--- a/Documentation/devicetree/bindings/devfreq/exynos-bus.txt
+++ b/Documentation/devicetree/bindings/devfreq/exynos-bus.txt
@@ -202,23 +202,23 @@ Example2 :
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@50000000 {
+               opp-50000000 {
                        opp-hz = /bits/ 64 <50000000>;
                        opp-microvolt = <800000>;
                };
-               opp@100000000 {
+               opp-100000000 {
                        opp-hz = /bits/ 64 <100000000>;
                        opp-microvolt = <800000>;
                };
-               opp@134000000 {
+               opp-134000000 {
                        opp-hz = /bits/ 64 <134000000>;
                        opp-microvolt = <800000>;
                };
-               opp@200000000 {
+               opp-200000000 {
                        opp-hz = /bits/ 64 <200000000>;
                        opp-microvolt = <825000>;
                };
-               opp@400000000 {
+               opp-400000000 {
                        opp-hz = /bits/ 64 <400000000>;
                        opp-microvolt = <875000>;
                };
@@ -292,23 +292,23 @@ Example2 :
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@50000000 {
+               opp-50000000 {
                        opp-hz = /bits/ 64 <50000000>;
                        opp-microvolt = <900000>;
                };
-               opp@80000000 {
+               opp-80000000 {
                        opp-hz = /bits/ 64 <80000000>;
                        opp-microvolt = <900000>;
                };
-               opp@100000000 {
+               opp-100000000 {
                        opp-hz = /bits/ 64 <100000000>;
                        opp-microvolt = <1000000>;
                };
-               opp@134000000 {
+               opp-134000000 {
                        opp-hz = /bits/ 64 <134000000>;
                        opp-microvolt = <1000000>;
                };
-               opp@200000000 {
+               opp-200000000 {
                        opp-hz = /bits/ 64 <200000000>;
                        opp-microvolt = <1000000>;
                };
@@ -318,19 +318,19 @@ Example2 :
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@50000000 {
+               opp-50000000 {
                        opp-hz = /bits/ 64 <50000000>;
                };
-               opp@80000000 {
+               opp-80000000 {
                        opp-hz = /bits/ 64 <80000000>;
                };
-               opp@100000000 {
+               opp-100000000 {
                        opp-hz = /bits/ 64 <100000000>;
                };
-               opp@200000000 {
+               opp-200000000 {
                        opp-hz = /bits/ 64 <200000000>;
                };
-               opp@400000000 {
+               opp-400000000 {
                        opp-hz = /bits/ 64 <400000000>;
                };
        };
@@ -339,19 +339,19 @@ Example2 :
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@50000000 {
+               opp-50000000 {
                        opp-hz = /bits/ 64 <50000000>;
                };
-               opp@80000000 {
+               opp-80000000 {
                        opp-hz = /bits/ 64 <80000000>;
                };
-               opp@100000000 {
+               opp-100000000 {
                        opp-hz = /bits/ 64 <100000000>;
                };
-               opp@200000000 {
+               opp-200000000 {
                        opp-hz = /bits/ 64 <200000000>;
                };
-               opp@300000000 {
+               opp-300000000 {
                        opp-hz = /bits/ 64 <300000000>;
                };
        };
@@ -360,13 +360,13 @@ Example2 :
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@50000000 {
+               opp-50000000 {
                        opp-hz = /bits/ 64 <50000000>;
                };
-               opp@80000000 {
+               opp-80000000 {
                        opp-hz = /bits/ 64 <80000000>;
                };
-               opp@100000000 {
+               opp-100000000 {
                        opp-hz = /bits/ 64 <100000000>;
                };
        };

diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
index 9c28ef4508e0d5a2f1d56a0a9b5b1849d6516c62..590ee442d0ae1bde4ebe2e067f968cf54c2348d5 100644 (file)
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -745,23 +745,23 @@
                        compatible = "operating-points-v2";
                        opp-shared;
 
-                       opp@50000000 {
+                       opp-50000000 {
                                opp-hz = /bits/ 64 <50000000>;
                                opp-microvolt = <800000>;
                        };
-                       opp@100000000 {
+                       opp-100000000 {
                                opp-hz = /bits/ 64 <100000000>;
                                opp-microvolt = <800000>;
                        };
-                       opp@134000000 {
+                       opp-134000000 {
                                opp-hz = /bits/ 64 <134000000>;
                                opp-microvolt = <800000>;
                        };
-                       opp@200000000 {
+                       opp-200000000 {
                                opp-hz = /bits/ 64 <200000000>;
                                opp-microvolt = <825000>;
                        };
-                       opp@400000000 {
+                       opp-400000000 {
                                opp-hz = /bits/ 64 <400000000>;
                                opp-microvolt = <875000>;
                        };
@@ -835,23 +835,23 @@
                        compatible = "operating-points-v2";
                        opp-shared;
 
-                       opp@50000000 {
+                       opp-50000000 {
                                opp-hz = /bits/ 64 <50000000>;
                                opp-microvolt = <900000>;
                        };
-                       opp@80000000 {
+                       opp-80000000 {
                                opp-hz = /bits/ 64 <80000000>;
                                opp-microvolt = <900000>;
                        };
-                       opp@100000000 {
+                       opp-100000000 {
                                opp-hz = /bits/ 64 <100000000>;
                                opp-microvolt = <1000000>;
                        };
-                       opp@134000000 {
+                       opp-134000000 {
                                opp-hz = /bits/ 64 <134000000>;
                                opp-microvolt = <1000000>;
                        };
-                       opp@200000000 {
+                       opp-200000000 {
                                opp-hz = /bits/ 64 <200000000>;
                                opp-microvolt = <1000000>;
                        };
@@ -861,19 +861,19 @@
                        compatible = "operating-points-v2";
                        opp-shared;
 
-                       opp@50000000 {
+                       opp-50000000 {
                                opp-hz = /bits/ 64 <50000000>;
                        };
-                       opp@80000000 {
+                       opp-80000000 {
                                opp-hz = /bits/ 64 <80000000>;
                        };
-                       opp@100000000 {
+                       opp-100000000 {
                                opp-hz = /bits/ 64 <100000000>;
                        };
-                       opp@200000000 {
+                       opp-200000000 {
                                opp-hz = /bits/ 64 <200000000>;
                        };
-                       opp@400000000 {
+                       opp-400000000 {
                                opp-hz = /bits/ 64 <400000000>;
                        };
                };
@@ -882,19 +882,19 @@
                        compatible = "operating-points-v2";
                        opp-shared;
 
-                       opp@50000000 {
+                       opp-50000000 {
                                opp-hz = /bits/ 64 <50000000>;
                        };
-                       opp@80000000 {
+                       opp-80000000 {
                                opp-hz = /bits/ 64 <80000000>;
                        };
-                       opp@100000000 {
+                       opp-100000000 {
                                opp-hz = /bits/ 64 <100000000>;
                        };
-                       opp@200000000 {
+                       opp-200000000 {
                                opp-hz = /bits/ 64 <200000000>;
                        };
-                       opp@300000000 {
+                       opp-300000000 {
                                opp-hz = /bits/ 64 <300000000>;
                        };
                };
@@ -903,13 +903,13 @@
                        compatible = "operating-points-v2";
                        opp-shared;
 
-                       opp@50000000 {
+                       opp-50000000 {
                                opp-hz = /bits/ 64 <50000000>;
                        };
-                       opp@80000000 {
+                       opp-80000000 {
                                opp-hz = /bits/ 64 <80000000>;
                        };
-                       opp@100000000 {
+                       opp-100000000 {
                                opp-hz = /bits/ 64 <100000000>;
                        };
                };

diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index e6e62103a71f3f21f7e1583de6a1a30eed68e31b..768fb075b1fd1b520b17f908e7797267200a1bde 100644 (file)
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -343,15 +343,15 @@
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@134000000 {
+               opp-134000000 {
                        opp-hz = /bits/ 64 <134000000>;
                        opp-microvolt = <1025000>;
                };
-               opp@267000000 {
+               opp-267000000 {
                        opp-hz = /bits/ 64 <267000000>;
                        opp-microvolt = <1050000>;
                };
-               opp@400000000 {
+               opp-400000000 {
                        opp-hz = /bits/ 64 <400000000>;
                        opp-microvolt = <1150000>;
                };
@@ -361,13 +361,13 @@
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@134000000 {
+               opp-134000000 {
                        opp-hz = /bits/ 64 <134000000>;
                };
-               opp@160000000 {
+               opp-160000000 {
                        opp-hz = /bits/ 64 <160000000>;
                };
-               opp@200000000 {
+               opp-200000000 {
                        opp-hz = /bits/ 64 <200000000>;
                };
        };
@@ -376,10 +376,10 @@
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@5000000 {
+               opp-5000000 {
                        opp-hz = /bits/ 64 <5000000>;
                };
-               opp@100000000 {
+               opp-100000000 {
                        opp-hz = /bits/ 64 <100000000>;
                };
        };
@@ -388,10 +388,10 @@
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@10000000 {
+               opp-10000000 {
                        opp-hz = /bits/ 64 <10000000>;
                };
-               opp@134000000 {
+               opp-134000000 {
                        opp-hz = /bits/ 64 <134000000>;
                };
        };
@@ -400,13 +400,13 @@
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@100000000 {
+               opp-100000000 {
                        opp-hz = /bits/ 64 <100000000>;
                };
-               opp@134000000 {
+               opp-134000000 {
                        opp-hz = /bits/ 64 <134000000>;
                };
-               opp@160000000 {
+               opp-160000000 {
                        opp-hz = /bits/ 64 <160000000>;
                };
        };
@@ -415,13 +415,13 @@
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@100000000 {
+               opp-100000000 {
                        opp-hz = /bits/ 64 <100000000>;
                };
-               opp@160000000 {
+               opp-160000000 {
                        opp-hz = /bits/ 64 <160000000>;
                };
-               opp@200000000 {
+               opp-200000000 {
                        opp-hz = /bits/ 64 <200000000>;
                };
        };

diff --git a/arch/arm/boot/dts/exynos4412-prime.dtsi b/arch/arm/boot/dts/exynos4412-prime.dtsi
index e75bc170c89c89ecbfd001fa07904d823d745f04..a67bd953d754aa11847aa4fa66b2249fefcd0838 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-prime.dtsi
+++ b/arch/arm/boot/dts/exynos4412-prime.dtsi
@@ -20,12 +20,12 @@
 };
 
 &cpu0_opp_table {
-       opp@1600000000 {
+       opp-1600000000 {
                opp-hz = /bits/ 64 <1600000000>;
                opp-microvolt = <1350000>;
                clock-latency-ns = <200000>;
        };
-       opp@1704000000 {
+       opp-1704000000 {
                opp-hz = /bits/ 64 <1704000000>;
                opp-microvolt = <1350000>;
                clock-latency-ns = <200000>;

diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index cc69466f17c0f1501f6db233b5a9fa9c376d9c0e..7ff03a7e8fb93e9cfcdeb89c1bd39e85e12f5bd8 100644 (file)
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -76,73 +76,73 @@
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@200000000 {
+               opp-200000000 {
                        opp-hz = /bits/ 64 <200000000>;
                        opp-microvolt = <900000>;
                        clock-latency-ns = <200000>;
                };
-               opp@300000000 {
+               opp-300000000 {
                        opp-hz = /bits/ 64 <300000000>;
                        opp-microvolt = <900000>;
                        clock-latency-ns = <200000>;
                };
-               opp@400000000 {
+               opp-400000000 {
                        opp-hz = /bits/ 64 <400000000>;
                        opp-microvolt = <925000>;
                        clock-latency-ns = <200000>;
                };
-               opp@500000000 {
+               opp-500000000 {
                        opp-hz = /bits/ 64 <500000000>;
                        opp-microvolt = <950000>;
                        clock-latency-ns = <200000>;
                };
-               opp@600000000 {
+               opp-600000000 {
                        opp-hz = /bits/ 64 <600000000>;
                        opp-microvolt = <975000>;
                        clock-latency-ns = <200000>;
                };
-               opp@700000000 {
+               opp-700000000 {
                        opp-hz = /bits/ 64 <700000000>;
                        opp-microvolt = <987500>;
                        clock-latency-ns = <200000>;
                };
-               opp@800000000 {
+               opp-800000000 {
                        opp-hz = /bits/ 64 <800000000>;
                        opp-microvolt = <1000000>;
                        clock-latency-ns = <200000>;
                        opp-suspend;
                };
-               opp@900000000 {
+               opp-900000000 {
                        opp-hz = /bits/ 64 <900000000>;
                        opp-microvolt = <1037500>;
                        clock-latency-ns = <200000>;
                };
-               opp@1000000000 {
+               opp-1000000000 {
                        opp-hz = /bits/ 64 <1000000000>;
                        opp-microvolt = <1087500>;
                        clock-latency-ns = <200000>;
                };
-               opp@1100000000 {
+               opp-1100000000 {
                        opp-hz = /bits/ 64 <1100000000>;
                        opp-microvolt = <1137500>;
                        clock-latency-ns = <200000>;
                };
-               opp@1200000000 {
+               opp-1200000000 {
                        opp-hz = /bits/ 64 <1200000000>;
                        opp-microvolt = <1187500>;
                        clock-latency-ns = <200000>;
                };
-               opp@1300000000 {
+               opp-1300000000 {
                        opp-hz = /bits/ 64 <1300000000>;
                        opp-microvolt = <1250000>;
                        clock-latency-ns = <200000>;
                };
-               opp@1400000000 {
+               opp-1400000000 {
                        opp-hz = /bits/ 64 <1400000000>;
                        opp-microvolt = <1287500>;
                        clock-latency-ns = <200000>;
                };
-               cpu0_opp_1500: opp@1500000000 {
+               cpu0_opp_1500: opp-1500000000 {
                        opp-hz = /bits/ 64 <1500000000>;
                        opp-microvolt = <1350000>;
                        clock-latency-ns = <200000>;
@@ -442,23 +442,23 @@
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@100000000 {
+               opp-100000000 {
                        opp-hz = /bits/ 64 <100000000>;
                        opp-microvolt = <900000>;
                };
-               opp@134000000 {
+               opp-134000000 {
                        opp-hz = /bits/ 64 <134000000>;
                        opp-microvolt = <900000>;
                };
-               opp@160000000 {
+               opp-160000000 {
                        opp-hz = /bits/ 64 <160000000>;
                        opp-microvolt = <900000>;
                };
-               opp@267000000 {
+               opp-267000000 {
                        opp-hz = /bits/ 64 <267000000>;
                        opp-microvolt = <950000>;
                };
-               opp@400000000 {
+               opp-400000000 {
                        opp-hz = /bits/ 64 <400000000>;
                        opp-microvolt = <1050000>;
                };
@@ -468,16 +468,16 @@
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@100000000 {
+               opp-100000000 {
                        opp-hz = /bits/ 64 <100000000>;
                };
-               opp@134000000 {
+               opp-134000000 {
                        opp-hz = /bits/ 64 <134000000>;
                };
-               opp@160000000 {
+               opp-160000000 {
                        opp-hz = /bits/ 64 <160000000>;
                };
-               opp@267000000 {
+               opp-267000000 {
                        opp-hz = /bits/ 64 <267000000>;
                };
        };
@@ -534,19 +534,19 @@
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@100000000 {
+               opp-100000000 {
                        opp-hz = /bits/ 64 <100000000>;
                        opp-microvolt = <900000>;
                };
-               opp@134000000 {
+               opp-134000000 {
                        opp-hz = /bits/ 64 <134000000>;
                        opp-microvolt = <925000>;
                };
-               opp@160000000 {
+               opp-160000000 {
                        opp-hz = /bits/ 64 <160000000>;
                        opp-microvolt = <950000>;
                };
-               opp@200000000 {
+               opp-200000000 {
                        opp-hz = /bits/ 64 <200000000>;
                        opp-microvolt = <1000000>;
                };
@@ -556,10 +556,10 @@
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@160000000 {
+               opp-160000000 {
                        opp-hz = /bits/ 64 <160000000>;
                };
-               opp@200000000 {
+               opp-200000000 {
                        opp-hz = /bits/ 64 <200000000>;
                };
        };
@@ -568,10 +568,10 @@
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@100000000 {
+               opp-100000000 {
                        opp-hz = /bits/ 64 <100000000>;
                };
-               opp@134000000 {
+               opp-134000000 {
                        opp-hz = /bits/ 64 <134000000>;
                };
        };
@@ -580,10 +580,10 @@
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@50000000 {
+               opp-50000000 {
                        opp-hz = /bits/ 64 <50000000>;
                };
-               opp@100000000 {
+               opp-100000000 {
                        opp-hz = /bits/ 64 <100000000>;
                };
        };

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 83b3899d228d8902cb0f41ada866a0d4e6ec633b..0db0bcf8da3652a3cf5662b38cfcfb89118732c7 100644 (file)
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -49,62 +49,62 @@
                cluster_a15_opp_table: opp_table0 {
                        compatible = "operating-points-v2";
                        opp-shared;
-                       opp@1800000000 {
+                       opp-1800000000 {
                                opp-hz = /bits/ 64 <1800000000>;
                                opp-microvolt = <1250000>;
                                clock-latency-ns = <140000>;
                        };
-                       opp@1700000000 {
+                       opp-1700000000 {
                                opp-hz = /bits/ 64 <1700000000>;
                                opp-microvolt = <1212500>;
                                clock-latency-ns = <140000>;
                        };
-                       opp@1600000000 {
+                       opp-1600000000 {
                                opp-hz = /bits/ 64 <1600000000>;
                                opp-microvolt = <1175000>;
                                clock-latency-ns = <140000>;
                        };
-                       opp@1500000000 {
+                       opp-1500000000 {
                                opp-hz = /bits/ 64 <1500000000>;
                                opp-microvolt = <1137500>;
                                clock-latency-ns = <140000>;
                        };
-                       opp@1400000000 {
+                       opp-1400000000 {
                                opp-hz = /bits/ 64 <1400000000>;
                                opp-microvolt = <1112500>;
                                clock-latency-ns = <140000>;
                        };
-                       opp@1300000000 {
+                       opp-1300000000 {
                                opp-hz = /bits/ 64 <1300000000>;
                                opp-microvolt = <1062500>;
                                clock-latency-ns = <140000>;
                        };
-                       opp@1200000000 {
+                       opp-1200000000 {
                                opp-hz = /bits/ 64 <1200000000>;
                                opp-microvolt = <1037500>;
                                clock-latency-ns = <140000>;
                        };
-                       opp@1100000000 {
+                       opp-1100000000 {
                                opp-hz = /bits/ 64 <1100000000>;
                                opp-microvolt = <1012500>;
                                clock-latency-ns = <140000>;
                        };
-                       opp@1000000000 {
+                       opp-1000000000 {
                                opp-hz = /bits/ 64 <1000000000>;
                                opp-microvolt = < 987500>;
                                clock-latency-ns = <140000>;
                        };
-                       opp@900000000 {
+                       opp-900000000 {
                                opp-hz = /bits/ 64 <900000000>;
                                opp-microvolt = < 962500>;
                                clock-latency-ns = <140000>;
                        };
-                       opp@800000000 {
+                       opp-800000000 {
                                opp-hz = /bits/ 64 <800000000>;
                                opp-microvolt = < 937500>;
                                clock-latency-ns = <140000>;
                        };
-                       opp@700000000 {
+                       opp-700000000 {
                                opp-hz = /bits/ 64 <700000000>;
                                opp-microvolt = < 912500>;
                                clock-latency-ns = <140000>;
@@ -114,42 +114,42 @@
                cluster_a7_opp_table: opp_table1 {
                        compatible = "operating-points-v2";
                        opp-shared;
-                       opp@1300000000 {
+                       opp-1300000000 {
                                opp-hz = /bits/ 64 <1300000000>;
                                opp-microvolt = <1275000>;
                                clock-latency-ns = <140000>;
                        };
-                       opp@1200000000 {
+                       opp-1200000000 {
                                opp-hz = /bits/ 64 <1200000000>;
                                opp-microvolt = <1212500>;
                                clock-latency-ns = <140000>;
                        };
-                       opp@1100000000 {
+                       opp-1100000000 {
                                opp-hz = /bits/ 64 <1100000000>;
                                opp-microvolt = <1162500>;
                                clock-latency-ns = <140000>;
                        };
-                       opp@1000000000 {
+                       opp-1000000000 {
                                opp-hz = /bits/ 64 <1000000000>;
                                opp-microvolt = <1112500>;
                                clock-latency-ns = <140000>;
                        };
-                       opp@900000000 {
+                       opp-900000000 {
                                opp-hz = /bits/ 64 <900000000>;
                                opp-microvolt = <1062500>;
                                clock-latency-ns = <140000>;
                        };
-                       opp@800000000 {
+                       opp-800000000 {
                                opp-hz = /bits/ 64 <800000000>;
                                opp-microvolt = <1025000>;
                                clock-latency-ns = <140000>;
                        };
-                       opp@700000000 {
+                       opp-700000000 {
                                opp-hz = /bits/ 64 <700000000>;
                                opp-microvolt = <975000>;
                                clock-latency-ns = <140000>;
                        };
-                       opp@600000000 {
+                       opp-600000000 {
                                opp-hz = /bits/ 64 <600000000>;
                                opp-microvolt = <937500>;
                                clock-latency-ns = <140000>;

diff --git a/arch/arm/boot/dts/exynos5800.dtsi b/arch/arm/boot/dts/exynos5800.dtsi
index 8213016803e5d4b1465e7c6742926c6734de10b8..9ddb6bacac5ac8ea7b8feb1e21566f545f1cd67c 100644 (file)
--- a/arch/arm/boot/dts/exynos5800.dtsi
+++ b/arch/arm/boot/dts/exynos5800.dtsi
@@ -24,60 +24,60 @@
 };
 
 &cluster_a15_opp_table {
-       opp@1700000000 {
+       opp-1700000000 {
                opp-microvolt = <1250000>;
        };
-       opp@1600000000 {
+       opp-1600000000 {
                opp-microvolt = <1250000>;
        };
-       opp@1500000000 {
+       opp-1500000000 {
                opp-microvolt = <1100000>;
        };
-       opp@1400000000 {
+       opp-1400000000 {
                opp-microvolt = <1100000>;
        };
-       opp@1300000000 {
+       opp-1300000000 {
                opp-microvolt = <1100000>;
        };
-       opp@1200000000 {
+       opp-1200000000 {
                opp-microvolt = <1000000>;
        };
-       opp@1100000000 {
+       opp-1100000000 {
                opp-microvolt = <1000000>;
        };
-       opp@1000000000 {
+       opp-1000000000 {
                opp-microvolt = <1000000>;
        };
-       opp@900000000 {
+       opp-900000000 {
                opp-microvolt = <1000000>;
        };
-       opp@800000000 {
+       opp-800000000 {
                opp-microvolt = <900000>;
        };
-       opp@700000000 {
+       opp-700000000 {
                opp-microvolt = <900000>;
        };
-       opp@600000000 {
+       opp-600000000 {
                opp-hz = /bits/ 64 <600000000>;
                opp-microvolt = <900000>;
                clock-latency-ns = <140000>;
        };
-       opp@500000000 {
+       opp-500000000 {
                opp-hz = /bits/ 64 <500000000>;
                opp-microvolt = <900000>;
                clock-latency-ns = <140000>;
        };
-       opp@400000000 {
+       opp-400000000 {
                opp-hz = /bits/ 64 <400000000>;
                opp-microvolt = <900000>;
                clock-latency-ns = <140000>;
        };
-       opp@300000000 {
+       opp-300000000 {
                opp-hz = /bits/ 64 <300000000>;
                opp-microvolt = <900000>;
                clock-latency-ns = <140000>;
        };
-       opp@200000000 {
+       opp-200000000 {
                opp-hz = /bits/ 64 <200000000>;
                opp-microvolt = <900000>;
                clock-latency-ns = <140000>;
@@ -85,46 +85,46 @@
 };
 
 &cluster_a7_opp_table {
-       opp@1300000000 {
+       opp-1300000000 {
                opp-microvolt = <1250000>;
        };
-       opp@1200000000 {
+       opp-1200000000 {
                opp-microvolt = <1250000>;
        };
-       opp@1100000000 {
+       opp-1100000000 {
                opp-microvolt = <1250000>;
        };
-       opp@1000000000 {
+       opp-1000000000 {
                opp-microvolt = <1100000>;
        };
-       opp@900000000 {
+       opp-900000000 {
                opp-microvolt = <1100000>;
        };
-       opp@800000000 {
+       opp-800000000 {
                opp-microvolt = <1100000>;
        };
-       opp@700000000 {
+       opp-700000000 {
                opp-microvolt = <1000000>;
        };
-       opp@600000000 {
+       opp-600000000 {
                opp-microvolt = <1000000>;
        };
-       opp@500000000 {
+       opp-500000000 {
                opp-hz = /bits/ 64 <500000000>;
                opp-microvolt = <1000000>;
                clock-latency-ns = <140000>;
        };
-       opp@400000000 {
+       opp-400000000 {
                opp-hz = /bits/ 64 <400000000>;
                opp-microvolt = <1000000>;
                clock-latency-ns = <140000>;
        };
-       opp@300000000 {
+       opp-300000000 {
                opp-hz = /bits/ 64 <300000000>;
                opp-microvolt = <900000>;
                clock-latency-ns = <140000>;
        };
-       opp@200000000 {
+       opp-200000000 {
                opp-hz = /bits/ 64 <200000000>;
                opp-microvolt = <900000>;
                clock-latency-ns = <140000>;

diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
index 098ad557fee3259677340800eef05d10e71e06bd..e2b0da2c0bc771a5d5f3ef721ee45f58ad466554 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
@@ -106,6 +106,13 @@
                };
        };
 
+       irda_regulator: irda-regulator {
+               compatible = "regulator-fixed";
+               enable-active-high;
+               gpio = <&gpr3 3 GPIO_ACTIVE_HIGH>;
+               regulator-name = "irda_regulator";
+       };
+
        sound {
                compatible = "samsung,tm2-audio";
                audio-codec = <&wm5110>;
@@ -298,6 +305,8 @@
        status = "okay";
        vddcore-supply = <&ldo6_reg>;
        vddio-supply = <&ldo7_reg>;
+       samsung,burst-clock-frequency = <512000000>;
+       samsung,esc-clock-frequency = <16000000>;
        samsung,pll-clock-frequency = <24000000>;
        pinctrl-names = "default";
        pinctrl-0 = <&te_irq>;
@@ -749,6 +758,19 @@
        };
 };
 
+&hsi2c_5 {
+       status = "okay";
+
+       stmfts: touchscreen@49 {
+               compatible = "st,stmfts";
+               reg = <0x49>;
+               interrupt-parent = <&gpa1>;
+               interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
+               avdd-supply = <&ldo30_reg>;
+               vdd-supply = <&ldo31_reg>;
+       };
+};
+
 &hsi2c_7 {
        status = "okay";
 
@@ -894,7 +916,7 @@
                PIN(INPUT, gpa0-7, NONE, FAST_SR1);
 
                PIN(INPUT, gpa1-0, UP, FAST_SR1);
-               PIN(INPUT, gpa1-1, NONE, FAST_SR1);
+               PIN(INPUT, gpa1-1, UP, FAST_SR1);
                PIN(INPUT, gpa1-2, NONE, FAST_SR1);
                PIN(INPUT, gpa1-3, DOWN, FAST_SR1);
                PIN(INPUT, gpa1-4, DOWN, FAST_SR1);
@@ -1074,7 +1096,6 @@
                PIN(INPUT, gpg3-0, DOWN, FAST_SR1);
                PIN(INPUT, gpg3-1, DOWN, FAST_SR1);
                PIN(INPUT, gpg3-5, DOWN, FAST_SR1);
-               PIN(INPUT, gpg3-7, DOWN, FAST_SR1);
        };
 };
 
@@ -1152,6 +1173,24 @@
        };
 };
 
+&spi_3 {
+       status = "okay";
+       no-cs-readback;
+
+       irled@0 {
+               compatible = "ir-spi-led";
+               reg = <0x0>;
+               spi-max-frequency = <5000000>;
+               power-supply = <&irda_regulator>;
+               duty-cycle = <60>;
+               led-active-low;
+
+               controller-data {
+                       samsung,spi-feedback-delay = <0>;
+               };
+       };
+};
+
 &timer {
        clock-frequency = <24000000>;
 };

diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts b/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts
index dea0a6f5bc18f048b30fa6d543e19623cc18ca4c..3ff95277a8ec92b8981ab5a1cfc65acf17ad5468 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts
+++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts
@@ -52,6 +52,18 @@
        assigned-clock-rates = <250000000>, <400000000>;
 };
 
+&dsi {
+       panel@0 {
+               compatible = "samsung,s6e3ha2";
+               reg = <0>;
+               vdd3-supply = <&ldo27_reg>;
+               vci-supply = <&ldo28_reg>;
+               reset-gpios = <&gpg0 0 GPIO_ACTIVE_LOW>;
+               enable-gpios = <&gpf1 5 GPIO_ACTIVE_HIGH>;
+               te-gpios = <&gpf1 3 GPIO_ACTIVE_HIGH>;
+       };
+};
+
 &hsi2c_9 {
        status = "okay";
 
@@ -76,3 +88,8 @@
        regulator-min-microvolt = <3000000>;
        regulator-max-microvolt = <3000000>;
 };
+
+&stmfts {
+       touchscreen-size-x = <1439>;
+       touchscreen-size-y = <2559>;
+};

diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts b/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts
index 7891a31adc17594112a8edf1a9ad4914f3446718..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>;
@@ -63,3 +74,10 @@
        regulator-min-microvolt = <3300000>;
        regulator-max-microvolt = <3300000>;
 };
+
+&stmfts {
+       touchscreen-size-x = <1599>;
+       touchscreen-size-y = <2559>;
+       touch-key-connected;
+       ledvdd-supply = <&ldo33_reg>;
+};