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

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

Merge "ARM: dts: qcom: Update cpu voltage cooling device node"

parents 3b2b075d e69f4f59

qcom/katmai-cpu.dtsi

+30 −4
Original line number Diff line number Diff line
@@ -281,13 +281,13 @@ 
		};

	};





	qcom,cpu-voltage-cdev {

		apc1_cluster: qcom,apc1-cluster {

			/delete-property/ qcom,cpus;

			qcom,cpus = <&CPU4>;

		apc1_cluster: thermal-cluster-4-7 {

			/delete-property/ qcom,cluster0;

			/delete-property/ qcom,cluster1;

		};

	};



};



&funnel_apss {
@@ -298,9 +298,34 @@ 
};



&thermal_zones {

	cpu-1-0-step {

		cooling-maps {

			/delete-node/ cpu10_cdev1;

		};

	};



	cpu-1-1-step {

		cooling-maps {

			/delete-node/ cpu11_cdev1;

		};

	};



	cpu-1-2-step {

		cooling-maps {

			/delete-node/ cpu12_cdev1;

		};

	};



	cpu-1-3-step {

		cooling-maps {

			/delete-node/ cpu13_cdev1;

		};

	};



	cpu-1-4-step {

		cooling-maps {

			/delete-node/ cpu14_cdev;

			/delete-node/ cpu14_cdev1;

			/delete-node/ cpu14_cdev2;

		};

	};
@@ -308,6 +333,7 @@ 
	cpu-1-5-step {

		cooling-maps {

			/delete-node/ cpu15_cdev;

			/delete-node/ cpu15_cdev1;

			/delete-node/ cpu15_cdev2;

		};

	};

qcom/lahaina-thermal.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -171,8 +171,9 @@ 


	qcom,cpu-voltage-cdev {

		compatible = "qcom,cc-cooling-devices";

		apc1_cluster: qcom,apc1-cluster {

			qcom,cpus = <&CPU4 &CPU7>;

		apc1_cluster: thermal-cluster-4-7 {

			qcom,cluster0 = <&CPU4 &CPU5 &CPU6>;

			qcom,cluster1 = <&CPU7>;

			#cooling-cells = <2>;

		};

	};

qcom/shima-thermal.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -199,8 +199,9 @@ 


	qcom,cpu-voltage-cdev {

		compatible = "qcom,cc-cooling-devices";

		apc1_cluster: qcom,apc1-cluster {

			qcom,cpus = <&CPU4 &CPU7>;

		apc1_cluster: thermal-cluster-4-7 {

			qcom,cluster0 = <&CPU4 &CPU5 &CPU6>;

			qcom,cluster1 = <&CPU7>;

			#cooling-cells = <2>;

		};

	};

qcom/yupik-thermal.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -231,8 +231,9 @@ 


	qcom,cpu-voltage-cdev {

		compatible = "qcom,cc-cooling-devices";

		apc1_cluster: qcom,apc1-cluster {

			qcom,cpus = <&CPU4 &CPU7>;

		apc1_cluster: thermal-cluster-4-7 {

			qcom,cluster0 = <&CPU4 &CPU5 &CPU6>;

			qcom,cluster1 = <&CPU7>;

			#cooling-cells = <2>;

		};

	};