Merge "ARM: dts: msm: Add skin, modem and junction thermal config for YUPIK" (4c1092d8) · Commits · e / devices / android_kernel_fairphone_FP5

qcom/yupik-qrd.dtsi

+68 −2

Original line number	Diff line number	Diff line
		@@ -272,6 +272,42 @@
		thermal-sensors = <&pmk8350_adc_tm PM7325_ADC7_AMUX_THM1_100K_PU>;

		trips {
		quiet_skin_trip0: quiet-skin-trip0 {
		temperature = <43000>;
		hysteresis = <4000>;
		type = "passive";
		};

		quiet_batt_trip0: quiet-batt-trip0 {
		temperature = <44000>;
		hysteresis = <2000>;
		type = "passive";
		};

		quiet_skin_trip1: quiet-skin-trip1 {
		temperature = <45000>;
		hysteresis = <4000>;
		type = "passive";
		};

		quiet_batt_trip1: quiet-batt-trip1 {
		temperature = <46000>;
		hysteresis = <2000>;
		type = "passive";
		};

		quiet_batt_trip2: quiet-batt-trip2 {
		temperature = <48000>;
		hysteresis = <2000>;
		type = "passive";
		};

		quiet_batt_trip3: quiet-batt-trip3 {
		temperature = <49000>;
		hysteresis = <1000>;
		type = "passive";
		};

		quiet_apc_trip: quiet-apc-trip {
		temperature = <50000>;
		hysteresis = <0>;
		@@ -329,9 +365,39 @@
		cooling-device = <&cdsp_sw 4 4>;
		};

		modem-pa-cdev {
		skin-cdev0 {
		trip = <&quiet_skin_trip0>;
		cooling-device = <&modem_skin 1 1>;
		};

		skin-cdev1 {
		trip = <&quiet_skin_trip1>;
		cooling-device = <&modem_skin 2 2>;
		};

		skin-cdev2 {
		trip = <&quiet_cx_trip>;
		cooling-device = <&modem_pa 3 3>;
		cooling-device = <&modem_skin 3 3>;
		};

		batt-cdev0 {
		trip = <&quiet_batt_trip0>;
		cooling-device = <&battery_charger 4 4>;
		};

		batt-cdev1 {
		trip = <&quiet_batt_trip1>;
		cooling-device = <&battery_charger 8 8>;
		};

		batt-cdev2 {
		trip = <&quiet_batt_trip2>;
		cooling-device = <&battery_charger 12 12>;
		};

		batt-cdev3 {
		trip = <&quiet_batt_trip3>;
		cooling-device = <&battery_charger 16 16>;
		};
		};
		};

qcom/yupik-thermal.dtsi

+158 −4

Original line number	Diff line number	Diff line
		@@ -259,6 +259,94 @@
		};
		};

		modem-sub6-pa1-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "step_wise";
		thermal-sensors = <&qmi_sensor
		(QMI_MODEM_INST_ID+QMI_PA)>;
		trips {
		sub6_pa1_trip0: sub6-pa1-trip0 {
		temperature = <43000>;
		hysteresis = <4000>;
		type = "passive";
		};

		sub6_pa1_trip1: sub6-pa1-trip1 {
		temperature = <45000>;
		hysteresis = <4000>;
		type = "passive";
		};

		sub6_pa1_trip2: sub6-pa1-trip2 {
		temperature = <55000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};

		cooling-maps {
		pa_fr1_cdev0 {
		trip = <&sub6_pa1_trip0>;
		cooling-device = <&modem_pa_fr1 1 1>;
		};

		pa_fr1_cdev1 {
		trip = <&sub6_pa1_trip1>;
		cooling-device = <&modem_pa_fr1 2 2>;
		};

		pa_fr1_cdev2 {
		trip = <&sub6_pa1_trip2>;
		cooling-device = <&modem_pa_fr1 3 3>;
		};
		};
		};

		modem-lte-pa2-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "step_wise";
		thermal-sensors = <&qmi_sensor
		(QMI_MODEM_INST_ID+QMI_PA_1)>;
		trips {
		sub6_pa2_trip0: sub6-pa2-trip0 {
		temperature = <42000>;
		hysteresis = <4000>;
		type = "passive";
		};

		sub6_pa2_trip1: sub6-pa2-trip1 {
		temperature = <44000>;
		hysteresis = <4000>;
		type = "passive";
		};

		sub6_pa2_trip2: sub6-pa2-trip2 {
		temperature = <55000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};

		cooling-maps {
		pa_cdev0 {
		trip = <&sub6_pa2_trip0>;
		cooling-device = <&modem_pa 1 1>;
		};

		pa_cdev1 {
		trip = <&sub6_pa2_trip1>;
		cooling-device = <&modem_pa 2 2>;
		};

		pa_cdev2 {
		trip = <&sub6_pa2_trip2>;
		cooling-device = <&modem_pa 3 3>;
		};
		};
		};

		aoss-0-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		@@ -1277,7 +1365,7 @@
		};

		cooling-maps {
		cdsp-cdev {
		cdsp_cdev {
		trip = <&nspss0_trip>;
		cooling-device = <&cdsp_sw 4 4>;
		};
		@@ -1289,7 +1377,7 @@
		THERMAL_MAX_LIMIT>;
		};

		modem-pa-cdev {
		modem_pa_cdev {
		trip = <&nspss0_trip>;
		cooling-device = <&modem_pa 3 3>;
		};
		@@ -1310,7 +1398,7 @@
		};

		cooling-maps {
		cdsp-cdev {
		cdsp_cdev {
		trip = <&nspss1_trip>;
		cooling-device = <&cdsp_sw 4 4>;
		};
		@@ -1322,13 +1410,46 @@
		THERMAL_MAX_LIMIT>;
		};

		modem-pa-cdev {
		modem_pa_cdev {
		trip = <&nspss1_trip>;
		cooling-device = <&modem_pa 3 3>;
		};
		};
		};

		video-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "step_wise";
		thermal-sensors = <&tsens1 5>;
		trips {
		video_trip: video-trip {
		temperature = <100000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};

		cooling-maps {
		cdsp_cdev {
		trip = <&video_trip>;
		cooling-device = <&cdsp_sw 4 4>;
		};

		gpu_cdev {
		trip = <&video_trip>;
		/* throttle to 315000000Hz */
		cooling-device = <&msm_gpu THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		modem_pa_cdev {
		trip = <&video_trip>;
		cooling-device = <&modem_pa 3 3>;
		};
		};
		};

		mdmss-0-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		@@ -1501,6 +1622,39 @@
		};
		};

		camera-0-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "step_wise";
		thermal-sensors = <&tsens1 11>;
		trips {
		camera_trip: camera-trip {
		temperature = <100000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};

		cooling-maps {
		cdsp_cdev {
		trip = <&camera_trip>;
		cooling-device = <&cdsp_sw 4 4>;
		};

		gpu_cdev {
		trip = <&camera_trip>;
		/* throttle to 315000000Hz */
		cooling-device = <&msm_gpu THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		modem_pa_cdev {
		trip = <&camera_trip>;
		cooling-device = <&modem_pa 3 3>;
		};
		};
		};

		mx-pe-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;