Commit b9f34da7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt-4.12-2' of... 

Merge tag 'samsung-dt-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/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
parents 6d14b5a0 6a611d14

Documentation/devicetree/bindings/devfreq/exynos-bus.txt

+23 −23
Original line number Diff line number Diff line
@@ -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>;

		};

	};

arch/arm/boot/dts/exynos3250.dtsi

+23 −23
Original line number Diff line number Diff line
@@ -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>;

			};

		};

arch/arm/boot/dts/exynos4210.dtsi

+16 −16
Original line number Diff line number Diff line
@@ -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>;

		};

	};

arch/arm/boot/dts/exynos4412-prime.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/exynos4412.dtsi

+33 −33
Original line number Diff line number Diff line
@@ -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>;

		};

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE