Skip to content

Commit

Permalink
Merge tag 'samsung-dt-4.12-2' of git://git.kernel.org/pub/scm/linux/k…
Browse files Browse the repository at this point in the history 
…ernel/git/krzk/linux into next/dt

Pull "Fix DTC warnings in Exynos ARMv7 Device Tree sources." from Krzysztof Kozłowski:

* tag 'samsung-dt-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Use - instead of @ for DT OPP entries
  • Loading branch information
Arnd Bergmann committed Apr 27, 2017
2 parents 6d14b5a + 6a611d1 commit b9f34da
Show file tree
Hide file tree
Showing 10 changed files with 221 additions and 147 deletions.
46 changes: 23 additions & 23 deletions Documentation/devicetree/bindings/devfreq/exynos-bus.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
};
Expand Down Expand Up @@ -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>;
};
Expand All @@ -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>;
};
};
Expand All @@ -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>;
};
};
Expand All @@ -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>;
};
};
Expand Down
46 changes: 23 additions & 23 deletions arch/arm/boot/dts/exynos3250.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
};
Expand Down Expand Up @@ -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>;
};
Expand All @@ -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>;
};
};
Expand All @@ -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>;
};
};
Expand All @@ -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>;
};
};
Expand Down
32 changes: 16 additions & 16 deletions arch/arm/boot/dts/exynos4210.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
};
Expand All @@ -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>;
};
};
Expand All @@ -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>;
};
};
Expand All @@ -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>;
};
};
Expand All @@ -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>;
};
};
Expand All @@ -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>;
};
};
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/exynos4412-prime.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
Loading

0 comments on commit b9f34da

Please sign in to comment.