Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c69d812c authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Remove GPU low svs clocks for SA6155"

parents 6b3f84f4 aca4ed89

arch/arm64/boot/dts/qcom/sa6155.dtsi

+14 −66
Original line number Diff line number Diff line
@@ -184,6 +184,8 @@ 
	 * is calulated as FMAX/4.8 MHz round up to zero

	 * decimal places.

	 */



	/delete-node/qcom,gpu-pwrlevel-bins;

	qcom,gpu-pwrlevel-bins {

		#address-cells = <1>;

		#size-cells = <0>;
@@ -196,7 +198,7 @@ 


			qcom,speed-bin = <0>;



			qcom,initial-pwrlevel = <5>;

			qcom,initial-pwrlevel = <4>;

			qcom,ca-target-pwrlevel = <3>;



			/* TURBO */
@@ -244,18 +246,9 @@ 
				qcom,bus-max = <8>;

			};



			/* Low SVS */

			/* XO */

			qcom,gpu-pwrlevel@5 {

				reg = <5>;

				qcom,gpu-freq = <290000000>;

				qcom,bus-freq = <4>;

				qcom,bus-min = <4>;

				qcom,bus-max = <5>;

			};



			/* XO */

			qcom,gpu-pwrlevel@6 {

				reg = <6>;

				qcom,gpu-freq = <0>;

				qcom,bus-freq = <0>;

				qcom,bus-min = <0>;
@@ -269,7 +262,7 @@ 


			qcom,speed-bin = <177>;



			qcom,initial-pwrlevel = <5>;

			qcom,initial-pwrlevel = <4>;

			qcom,ca-target-pwrlevel = <3>;



			/* TURBO */
@@ -317,18 +310,9 @@ 
				qcom,bus-max = <8>;

			};



			/* Low SVS */

			/* XO */

			qcom,gpu-pwrlevel@5 {

				reg = <5>;

				qcom,gpu-freq = <290000000>;

				qcom,bus-freq = <4>;

				qcom,bus-min = <4>;

				qcom,bus-max = <5>;

			};



			/* XO */

			qcom,gpu-pwrlevel@6 {

				reg = <6>;

				qcom,gpu-freq = <0>;

				qcom,bus-freq = <0>;

				qcom,bus-min = <0>;
@@ -342,7 +326,7 @@ 


			qcom,speed-bin = <156>;



			qcom,initial-pwrlevel = <4>;

			qcom,initial-pwrlevel = <3>;

			qcom,ca-target-pwrlevel = <2>;



			/* NOM L1 */
@@ -381,18 +365,9 @@ 
				qcom,bus-max = <8>;

			};



			/* Low SVS */

			/* XO */

			qcom,gpu-pwrlevel@4 {

				reg = <4>;

				qcom,gpu-freq = <290000000>;

				qcom,bus-freq = <4>;

				qcom,bus-min = <4>;

				qcom,bus-max = <5>;

			};



			/* XO */

			qcom,gpu-pwrlevel@5 {

				reg = <5>;

				qcom,gpu-freq = <0>;

				qcom,bus-freq = <0>;

				qcom,bus-min = <0>;
@@ -406,7 +381,7 @@ 


			qcom,speed-bin = <136>;



			qcom,initial-pwrlevel = <3>;

			qcom,initial-pwrlevel = <2>;

			qcom,ca-target-pwrlevel = <1>;



			/* NOM */
@@ -436,18 +411,9 @@ 
				qcom,bus-max = <8>;

			};



			/* Low SVS */

			/* XO */

			qcom,gpu-pwrlevel@3 {

				reg = <3>;

				qcom,gpu-freq = <290000000>;

				qcom,bus-freq = <4>;

				qcom,bus-min = <4>;

				qcom,bus-max = <5>;

			};



			/* XO */

			qcom,gpu-pwrlevel@4 {

				reg = <4>;

				qcom,gpu-freq = <0>;

				qcom,bus-freq = <0>;

				qcom,bus-min = <0>;
@@ -462,7 +428,7 @@ 
			qcom,speed-bin = <105>;



			qcom,initial-pwrlevel = <1>;

			qcom,ca-target-pwrlevel = <2>;

			qcom,ca-target-pwrlevel = <0>;



			/* SVS L1 */

			qcom,gpu-pwrlevel@0 {
@@ -482,18 +448,9 @@ 
				qcom,bus-max = <8>;

			};



			/* Low SVS */

			/* XO */

			qcom,gpu-pwrlevel@2 {

				reg = <2>;

				qcom,gpu-freq = <290000000>;

				qcom,bus-freq = <4>;

				qcom,bus-min = <4>;

				qcom,bus-max = <5>;

			};



			/* XO */

			qcom,gpu-pwrlevel@3 {

				reg = <3>;

				qcom,gpu-freq = <0>;

				qcom,bus-freq = <0>;

				qcom,bus-min = <0>;
@@ -507,7 +464,7 @@ 


			qcom,speed-bin = <73>;



			qcom,initial-pwrlevel = <1>;

			qcom,initial-pwrlevel = <0>;

			qcom,ca-target-pwrlevel = <0>;



			/* SVS */
@@ -519,18 +476,9 @@ 
				qcom,bus-max = <8>;

			};



			/* Low SVS */

			/* XO */

			qcom,gpu-pwrlevel@1 {

				reg = <1>;

				qcom,gpu-freq = <290000000>;

				qcom,bus-freq = <4>;

				qcom,bus-min = <4>;

				qcom,bus-max = <5>;

			};



			/* XO */

			qcom,gpu-pwrlevel@2 {

				reg = <2>;

				qcom,gpu-freq = <0>;

				qcom,bus-freq = <0>;

				qcom,bus-min = <0>;

arch/arm64/boot/dts/qcom/sa6155p.dtsi

+14 −66
Original line number Diff line number Diff line
@@ -212,6 +212,8 @@ 
	 * is calulated as FMAX/4.8 MHz round up to zero

	 * decimal places.

	 */



	/delete-node/qcom,gpu-pwrlevel-bins;

	qcom,gpu-pwrlevel-bins {

		#address-cells = <1>;

		#size-cells = <0>;
@@ -224,7 +226,7 @@ 


			qcom,speed-bin = <0>;



			qcom,initial-pwrlevel = <5>;

			qcom,initial-pwrlevel = <4>;

			qcom,ca-target-pwrlevel = <3>;



			/* TURBO */
@@ -272,18 +274,9 @@ 
				qcom,bus-max = <8>;

			};



			/* Low SVS */

			/* XO */

			qcom,gpu-pwrlevel@5 {

				reg = <5>;

				qcom,gpu-freq = <290000000>;

				qcom,bus-freq = <4>;

				qcom,bus-min = <4>;

				qcom,bus-max = <5>;

			};



			/* XO */

			qcom,gpu-pwrlevel@6 {

				reg = <6>;

				qcom,gpu-freq = <0>;

				qcom,bus-freq = <0>;

				qcom,bus-min = <0>;
@@ -297,7 +290,7 @@ 


			qcom,speed-bin = <177>;



			qcom,initial-pwrlevel = <5>;

			qcom,initial-pwrlevel = <4>;

			qcom,ca-target-pwrlevel = <3>;



			/* TURBO */
@@ -345,18 +338,9 @@ 
				qcom,bus-max = <8>;

			};



			/* Low SVS */

			/* XO */

			qcom,gpu-pwrlevel@5 {

				reg = <5>;

				qcom,gpu-freq = <290000000>;

				qcom,bus-freq = <4>;

				qcom,bus-min = <4>;

				qcom,bus-max = <5>;

			};



			/* XO */

			qcom,gpu-pwrlevel@6 {

				reg = <6>;

				qcom,gpu-freq = <0>;

				qcom,bus-freq = <0>;

				qcom,bus-min = <0>;
@@ -370,7 +354,7 @@ 


			qcom,speed-bin = <156>;



			qcom,initial-pwrlevel = <4>;

			qcom,initial-pwrlevel = <3>;

			qcom,ca-target-pwrlevel = <2>;



			/* NOM L1 */
@@ -409,18 +393,9 @@ 
				qcom,bus-max = <8>;

			};



			/* Low SVS */

			/* XO */

			qcom,gpu-pwrlevel@4 {

				reg = <4>;

				qcom,gpu-freq = <290000000>;

				qcom,bus-freq = <4>;

				qcom,bus-min = <4>;

				qcom,bus-max = <5>;

			};



			/* XO */

			qcom,gpu-pwrlevel@5 {

				reg = <5>;

				qcom,gpu-freq = <0>;

				qcom,bus-freq = <0>;

				qcom,bus-min = <0>;
@@ -434,7 +409,7 @@ 


			qcom,speed-bin = <136>;



			qcom,initial-pwrlevel = <3>;

			qcom,initial-pwrlevel = <2>;

			qcom,ca-target-pwrlevel = <1>;



			/* NOM */
@@ -464,18 +439,9 @@ 
				qcom,bus-max = <8>;

			};



			/* Low SVS */

			/* XO */

			qcom,gpu-pwrlevel@3 {

				reg = <3>;

				qcom,gpu-freq = <290000000>;

				qcom,bus-freq = <4>;

				qcom,bus-min = <4>;

				qcom,bus-max = <5>;

			};



			/* XO */

			qcom,gpu-pwrlevel@4 {

				reg = <4>;

				qcom,gpu-freq = <0>;

				qcom,bus-freq = <0>;

				qcom,bus-min = <0>;
@@ -490,7 +456,7 @@ 
			qcom,speed-bin = <105>;



			qcom,initial-pwrlevel = <1>;

			qcom,ca-target-pwrlevel = <2>;

			qcom,ca-target-pwrlevel = <0>;



			/* SVS L1 */

			qcom,gpu-pwrlevel@0 {
@@ -510,18 +476,9 @@ 
				qcom,bus-max = <8>;

			};



			/* Low SVS */

			/* XO */

			qcom,gpu-pwrlevel@2 {

				reg = <2>;

				qcom,gpu-freq = <290000000>;

				qcom,bus-freq = <4>;

				qcom,bus-min = <4>;

				qcom,bus-max = <5>;

			};



			/* XO */

			qcom,gpu-pwrlevel@3 {

				reg = <3>;

				qcom,gpu-freq = <0>;

				qcom,bus-freq = <0>;

				qcom,bus-min = <0>;
@@ -535,7 +492,7 @@ 


			qcom,speed-bin = <73>;



			qcom,initial-pwrlevel = <1>;

			qcom,initial-pwrlevel = <0>;

			qcom,ca-target-pwrlevel = <0>;



			/* SVS */
@@ -547,18 +504,9 @@ 
				qcom,bus-max = <8>;

			};



			/* Low SVS */

			/* XO */

			qcom,gpu-pwrlevel@1 {

				reg = <1>;

				qcom,gpu-freq = <290000000>;

				qcom,bus-freq = <4>;

				qcom,bus-min = <4>;

				qcom,bus-max = <5>;

			};



			/* XO */

			qcom,gpu-pwrlevel@2 {

				reg = <2>;

				qcom,gpu-freq = <0>;

				qcom,bus-freq = <0>;

				qcom,bus-min = <0>;