Merge "ARM: dts: msm: Update skin and modem junction thermal config for YUPIK" (a7ddb72c) · Commits · e / devices / android_kernel_fairphone_FP5

qcom/yupik-qrd.dtsi

+39 −3

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

		trips {
		quiet_apc_trip: quiet-apc-trip {
		temperature = <50000>;
		hysteresis = <0>;
		type = "passive";
		};

		quiet_gpu_trip: quiet-gpu-trip {
		temperature = <52000>;
		hysteresis = <0>;
		type = "passive";
		};

		quiet_silver_trip: quiet-silver-trip {
		temperature = <55000>;
		hysteresis = <0>;
		type = "passive";
		};

		quiet_cx_trip: quiet-cx-trip {
		temperature = <55000>;
		hysteresis = <5000>;
		@@ -280,7 +298,26 @@
		};

		cooling-maps {
		gpu-cdev {
		apc_cluster_cdev:apc-cluster-cdev {
		trip = <&quiet_apc_trip>;
		cooling-device = <&apc1_cluster THERMAL_NO_LIMIT 5>;
		};

		cpu_silver_cdev:cpu-silver-cdev {
		trip = <&quiet_silver_trip>;
		/* throttle to 1516800KHz */
		cooling-device = <&CPU0 THERMAL_NO_LIMIT
		(THERMAL_MAX_LIMIT-6)>;
		};

		gpu-cdev_0 {
		trip = <&quiet_gpu_trip>;
		/* throttle to 555000000Hz */
		cooling-device = <&msm_gpu THERMAL_NO_LIMIT
		(THERMAL_MAX_LIMIT-2)>;
		};

		gpu-cdev_1 {
		trip = <&quiet_cx_trip>;
		/* throttle to 315000000Hz */
		cooling-device = <&msm_gpu THERMAL_MAX_LIMIT
		@@ -289,8 +326,7 @@

		cdsp-cdev {
		trip = <&quiet_cx_trip>;
		cooling-device = <&cdsp_sw (THERMAL_MAX_LIMIT-2)
		(THERMAL_MAX_LIMIT-2)>;
		cooling-device = <&cdsp_sw 4 4>;
		};

		modem-pa-cdev {

qcom/yupik-thermal.dtsi

+176 −4

Original line number	Diff line number	Diff line
		@@ -241,6 +241,8 @@
		&thermal_zones {
		/delete-node/ modem-sdr-mmw-usr;
		/delete-node/ modem-ambient-usr;
		/delete-node/ mdmss-1-step;
		/delete-node/ mdmss-2-step;

		msm-skin-therm-usr {
		polling-delay-passive = <0>;
		@@ -1277,8 +1279,7 @@
		cooling-maps {
		cdsp-cdev {
		trip = <&nspss0_trip>;
		cooling-device = <&cdsp_sw (THERMAL_MAX_LIMIT-2)
		(THERMAL_MAX_LIMIT-2)>;
		cooling-device = <&cdsp_sw 4 4>;
		};

		gpu_cdev {
		@@ -1311,8 +1312,7 @@
		cooling-maps {
		cdsp-cdev {
		trip = <&nspss1_trip>;
		cooling-device = <&cdsp_sw (THERMAL_MAX_LIMIT-2)
		(THERMAL_MAX_LIMIT-2)>;
		cooling-device = <&cdsp_sw 4 4>;
		};

		gpu_cdev {
		@@ -1329,6 +1329,178 @@
		};
		};

		mdmss-0-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "step_wise";
		thermal-sensors = <&tsens1 7>;
		trips {
		mdmss0_trip0: mdmss0-trip0 {
		temperature = <95000>;
		hysteresis = <15000>;
		type = "passive";
		};

		mdmss0_trip1: mdmss0-trip1 {
		temperature = <105000>;
		hysteresis = <15000>;
		type = "passive";
		};

		mdmss0_trip2: mdmss0-trip2 {
		temperature = <115000>;
		hysteresis = <15000>;
		type = "passive";
		};
		};

		cooling-maps {
		mdmss0_cdev0 {
		trip = <&mdmss0_trip0>;
		cooling-device = <&modem_tj 1 1>;
		};

		mdmss0_cdev1 {
		trip = <&mdmss0_trip1>;
		cooling-device = <&modem_tj 2 2>;
		};

		mdmss0_cdev2 {
		trip = <&mdmss0_trip2>;
		cooling-device = <&modem_tj 3 3>;
		};
		};
		};

		mdmss-1-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "step_wise";
		thermal-sensors = <&tsens1 8>;
		trips {
		mdmss1_trip0: mdmss1-trip0 {
		temperature = <95000>;
		hysteresis = <15000>;
		type = "passive";
		};

		mdmss1_trip1: mdmss1-trip1 {
		temperature = <105000>;
		hysteresis = <15000>;
		type = "passive";
		};

		mdmss1_trip2: mdmss1-trip2 {
		temperature = <115000>;
		hysteresis = <15000>;
		type = "passive";
		};
		};

		cooling-maps {
		mdmss1_cdev0 {
		trip = <&mdmss1_trip0>;
		cooling-device = <&modem_tj 1 1>;
		};

		mdmss1_cdev1 {
		trip = <&mdmss1_trip1>;
		cooling-device = <&modem_tj 2 2>;
		};

		mdmss1_cdev2 {
		trip = <&mdmss1_trip2>;
		cooling-device = <&modem_tj 3 3>;
		};
		};
		};

		mdmss-2-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "step_wise";
		thermal-sensors = <&tsens1 9>;
		trips {
		mdmss2_trip0: mdmss2-trip0 {
		temperature = <95000>;
		hysteresis = <15000>;
		type = "passive";
		};

		mdmss2_trip1: mdmss2-trip1 {
		temperature = <105000>;
		hysteresis = <15000>;
		type = "passive";
		};

		mdmss2_trip2: mdmss2-trip2 {
		temperature = <115000>;
		hysteresis = <15000>;
		type = "passive";
		};
		};

		cooling-maps {
		mdmss2_cdev0 {
		trip = <&mdmss2_trip0>;
		cooling-device = <&modem_tj 1 1>;
		};

		mdmss2_cdev1 {
		trip = <&mdmss2_trip1>;
		cooling-device = <&modem_tj 2 2>;
		};

		mdmss2_cdev2 {
		trip = <&mdmss2_trip2>;
		cooling-device = <&modem_tj 3 3>;
		};
		};
		};

		mdmss-3-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "step_wise";
		thermal-sensors = <&tsens1 10>;
		trips {
		mdmss3_trip0: mdmss3-trip0 {
		temperature = <95000>;
		hysteresis = <15000>;
		type = "passive";
		};

		mdmss3_trip1: mdmss3-trip1 {
		temperature = <105000>;
		hysteresis = <15000>;
		type = "passive";
		};

		mdmss3_trip2: mdmss3-trip2 {
		temperature = <115000>;
		hysteresis = <15000>;
		type = "passive";
		};
		};

		cooling-maps {
		mdmss3_cdev0 {
		trip = <&mdmss3_trip0>;
		cooling-device = <&modem_tj 1 1>;
		};

		mdmss3_cdev1 {
		trip = <&mdmss3_trip1>;
		cooling-device = <&modem_tj 2 2>;
		};

		mdmss3_cdev2 {
		trip = <&mdmss3_trip2>;
		cooling-device = <&modem_tj 3 3>;
		};
		};
		};

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