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

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

Merge "ARM: dts: qcom: Enable thermal zones and cooling devices for sa6155"

parents 8684b403 ae206c28

qcom/pm6155.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
			reg = <0x2400>;

			interrupts = <0x0 0x24 0x0 IRQ_TYPE_EDGE_BOTH>;

			#thermal-sensor-cells = <0>;

			qcom,temperature-threshold-set = <1>;

		};



		qcom,power-on@800 {
@@ -146,7 +145,6 @@ 
		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm6155_1_tz>;

		wake-capable-sensor;



		trips {

			pm6155_trip0: trip0 {

qcom/sa6155-pmic.dtsi

+47 −0
Original line number Diff line number Diff line
@@ -61,3 +61,50 @@ 
	vdda-0p9-supply = <&pm6155_1_l5>;

};



&thermal_zones {

	pm6155-1-tz {

		cooling-maps {

			trip0_cpu0 {

				trip = <&pm6155_trip0>;

				cooling-device =

					<&CPU0 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};



			trip0_cpu1 {

				trip = <&pm6155_trip0>;

				cooling-device = <&cpu1_isolate 1 1>;

			};



			trip0_cpu2 {

				trip = <&pm6155_trip0>;

				cooling-device = <&cpu2_isolate 1 1>;

			};



			trip0_cpu3 {

				trip = <&pm6155_trip0>;

				cooling-device = <&cpu3_isolate 1 1>;

			};



			trip0_cpu4 {

				trip = <&pm6155_trip0>;

				cooling-device = <&cpu4_isolate 1 1>;

			};



			trip0_cpu5 {

				trip = <&pm6155_trip0>;

				cooling-device = <&cpu5_isolate 1 1>;

			};



			trip0_cpu6 {

				trip = <&pm6155_trip0>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			trip0_cpu7 {

				trip = <&pm6155_trip0>;

				cooling-device = <&cpu7_isolate 1 1>;

			};

		};

	};

};

qcom/sa6155.dtsi

+127 −0
Original line number Diff line number Diff line
@@ -69,6 +69,133 @@ 
	compatible = "qcom,sa6155-videocc", "syscon";

};



&thermal_zones {

	cpuss-0-step {

		trips {

			cpu45-config {

				temperature = <115000>;

			};

		};

	};



	cpuss-1-step {

		trips {

			cpu23-config {

				temperature = <115000>;

			};

		};

	};



	cpuss-2-step {

		trips {

			cpu01-config {

				temperature = <115000>;

			};

		};

	};



	cpu-1-0-step {

		trips {

			cpu6-0-config {

				temperature = <115000>;

			};

		};

	};



	cpu-1-1-step {

		trips {

			cpu6-1-config {

				temperature = <115000>;

			};

		};

	};



	cpu-1-2-step {

		trips {

			cpu7-0-config {

				temperature = <115000>;

			};

		};

	};



	cpu-1-3-step {

		trips {

			cpu7-1-config {

				temperature = <115000>;

			};

		};

	};



	gpu-step {

		trips {

			gpu-trip {

				temperature = <105000>;

			};



			gpu-cx-mon {

				temperature = <110000>;

			};

		};

	};



	q6-hvx-step {

		trips {

			q6-hvx-config {

				temperature = <105000>;

			};



			q6-hvx-trip1 {

				temperature = <105000>;

			};



			q6-hvx-cx-mon {

				temperature = <110000>;

			};

		};

	};



	mdm-core-step {

		trips {

			mdm-core-cx-mon {

				temperature = <110000>;

			};

		};

	};



	camera-step {

		trips {

			camera-cx-mon {

				temperature = <110000>;

			};

		};

	};



	wlan-step {

		trips {

			wlan-cx-mon {

				temperature = <110000>;

			};

		};

	};



	display-step {

		trips {

			display-cx-mon {

				temperature = <110000>;

			};

		};

	};



	video-step {

		trips {

			video-cx-mon {

				temperature = <110000>;

			};

		};

	};

};





#include "sa6155-pcie.dtsi"

&slpi_tlmm {

	status = "ok";

qcom/sa8155-pmic-overlay.dtsi

+28 −46
Original line number Diff line number Diff line
@@ -163,54 +163,45 @@ pm8150_1_gpios: &pm8150_gpios { 
		};



		cooling-maps {

			/*

			 * trip0 cooling map is dummy node to enable

			 * passive polling on trip0 violation.

			 */

			trip0_cpu0 {

				trip = <&pm8150_2_trip0>;

				cooling-device = <&CPU0 0 0>;

			};



			trip1_cpu0 {

				trip = <&pm8150_2_trip1>;

				cooling-device =

					<&CPU0 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};



			trip1_cpu1 {

				trip = <&pm8150_2_trip1>;

			trip0_cpu1 {

				trip = <&pm8150_2_trip0>;

				cooling-device = <&cpu1_isolate 1 1>;

			};



			trip1_cpu2 {

				trip = <&pm8150_2_trip1>;

			trip0_cpu2 {

				trip = <&pm8150_2_trip0>;

				cooling-device = <&cpu2_isolate 1 1>;

			};



			trip1_cpu3 {

				trip = <&pm8150_2_trip1>;

			trip0_cpu3 {

				trip = <&pm8150_2_trip0>;

				cooling-device = <&cpu3_isolate 1 1>;

			};



			trip1_cpu4 {

				trip = <&pm8150_2_trip1>;

			trip0_cpu4 {

				trip = <&pm8150_2_trip0>;

				cooling-device = <&cpu4_isolate 1 1>;

			};



			trip1_cpu5 {

				trip = <&pm8150_2_trip1>;

			trip0_cpu5 {

				trip = <&pm8150_2_trip0>;

				cooling-device = <&cpu5_isolate 1 1>;

			};



			trip1_cpu6 {

				trip = <&pm8150_2_trip1>;

			trip0_cpu6 {

				trip = <&pm8150_2_trip0>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			trip1_cpu7 {

				trip = <&pm8150_2_trip1>;

			trip0_cpu7 {

				trip = <&pm8150_2_trip0>;

				cooling-device = <&cpu7_isolate 1 1>;

			};

		};
@@ -218,54 +209,45 @@ pm8150_1_gpios: &pm8150_gpios { 


	pm8150_tz {

		cooling-maps {

			/*

			 * trip0 cooling map is dummy node to enable

			 * passive polling on trip0 violation.

			 */

			trip0_cpu0 {

				trip = <&pm8150_trip0>;

				cooling-device = <&CPU0 0 0>;

			};



			trip1_cpu0 {

				trip = <&pm8150_trip1>;

				cooling-device =

					<&CPU0 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};



			trip1_cpu1 {

				trip = <&pm8150_trip1>;

			trip0_cpu1 {

				trip = <&pm8150_trip0>;

				cooling-device = <&cpu1_isolate 1 1>;

			};



			trip1_cpu2 {

				trip = <&pm8150_trip1>;

			trip0_cpu2 {

				trip = <&pm8150_trip0>;

				cooling-device = <&cpu2_isolate 1 1>;

			};



			trip1_cpu3 {

				trip = <&pm8150_trip1>;

			trip0_cpu3 {

				trip = <&pm8150_trip0>;

				cooling-device = <&cpu3_isolate 1 1>;

			};



			trip1_cpu4 {

				trip = <&pm8150_trip1>;

			trip0_cpu4 {

				trip = <&pm8150_trip0>;

				cooling-device = <&cpu4_isolate 1 1>;

			};



			trip1_cpu5 {

				trip = <&pm8150_trip1>;

			trip0_cpu5 {

				trip = <&pm8150_trip0>;

				cooling-device = <&cpu5_isolate 1 1>;

			};



			trip1_cpu6 {

				trip = <&pm8150_trip1>;

			trip0_cpu6 {

				trip = <&pm8150_trip0>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			trip1_cpu7 {

				trip = <&pm8150_trip1>;

			trip0_cpu7 {

				trip = <&pm8150_trip0>;

				cooling-device = <&cpu7_isolate 1 1>;

			};

		};

qcom/sa8195-pmic.dtsi

+139 −0
Original line number Diff line number Diff line
@@ -59,6 +59,13 @@ 
	/delete-node/ refgen;

};



&lmh_dcvs1 {

	isens_vref_0p8-supply = <&pm8195_3_l5>;

	isens-vref-0p8-settings = <880000 880000 20000>;

	isens_vref_1p8-supply = <&pm8195_1_l12>;

	isens-vref-1p8-settings = <1800000 1800000 20000>;

};



&camcc {

	vdd_mx-supply = <&VDD_MX_LEVEL>;

	vdd_mm-supply = <&VDD_MMCX_LEVEL>;
@@ -97,6 +104,50 @@ 
				type = "critical";

			};

		};



		cooling-maps {

			trip0_cpu0 {

				trip = <&pm8195_1_trip0>;

				cooling-device =

					<&CPU0 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};



			trip0_cpu1 {

				trip = <&pm8195_1_trip0>;

				cooling-device = <&cpu1_isolate 1 1>;

			};



			trip0_cpu2 {

				trip = <&pm8195_1_trip0>;

				cooling-device = <&cpu2_isolate 1 1>;

			};



			trip0_cpu3 {

				trip = <&pm8195_1_trip0>;

				cooling-device = <&cpu3_isolate 1 1>;

			};



			trip0_cpu4 {

				trip = <&pm8195_1_trip0>;

				cooling-device = <&cpu4_isolate 1 1>;

			};



			trip0_cpu5 {

				trip = <&pm8195_1_trip0>;

				cooling-device = <&cpu5_isolate 1 1>;

			};



			trip0_cpu6 {

				trip = <&pm8195_1_trip0>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			trip0_cpu7 {

				trip = <&pm8195_1_trip0>;

				cooling-device = <&cpu7_isolate 1 1>;

			};

		};

	};



	pm8195_2_temp_alarm: pm8195_2_tz {
@@ -124,6 +175,50 @@ 
				type = "critical";

			};

		};



		cooling-maps {

			trip0_cpu0 {

				trip = <&pm8195_2_trip0>;

				cooling-device =

					<&CPU0 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};



			trip0_cpu1 {

				trip = <&pm8195_2_trip0>;

				cooling-device = <&cpu1_isolate 1 1>;

			};



			trip0_cpu2 {

				trip = <&pm8195_2_trip0>;

				cooling-device = <&cpu2_isolate 1 1>;

			};



			trip0_cpu3 {

				trip = <&pm8195_2_trip0>;

				cooling-device = <&cpu3_isolate 1 1>;

			};



			trip0_cpu4 {

				trip = <&pm8195_2_trip0>;

				cooling-device = <&cpu4_isolate 1 1>;

			};



			trip0_cpu5 {

				trip = <&pm8195_2_trip0>;

				cooling-device = <&cpu5_isolate 1 1>;

			};



			trip0_cpu6 {

				trip = <&pm8195_2_trip0>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			trip0_cpu7 {

				trip = <&pm8195_2_trip0>;

				cooling-device = <&cpu7_isolate 1 1>;

			};

		};

	};



	pm8195_3_temp_alarm: pm8195_3_tz {
@@ -151,5 +246,49 @@ 
				type = "critical";

			};

		};



		cooling-maps {

			trip0_cpu0 {

				trip = <&pm8195_3_trip0>;

				cooling-device =

					<&CPU0 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};



			trip0_cpu1 {

				trip = <&pm8195_3_trip0>;

				cooling-device = <&cpu1_isolate 1 1>;

			};



			trip0_cpu2 {

				trip = <&pm8195_3_trip0>;

				cooling-device = <&cpu2_isolate 1 1>;

			};



			trip0_cpu3 {

				trip = <&pm8195_3_trip0>;

				cooling-device = <&cpu3_isolate 1 1>;

			};



			trip0_cpu4 {

				trip = <&pm8195_3_trip0>;

				cooling-device = <&cpu4_isolate 1 1>;

			};



			trip0_cpu5 {

				trip = <&pm8195_3_trip0>;

				cooling-device = <&cpu5_isolate 1 1>;

			};



			trip0_cpu6 {

				trip = <&pm8195_3_trip0>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			trip0_cpu7 {

				trip = <&pm8195_3_trip0>;

				cooling-device = <&cpu7_isolate 1 1>;

			};

		};

	};

};