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

Commit d590d97b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add wakeup capable flag to thermal zones for MSM8937/SDM439"

parents 4089abae 72554b1f

arch/arm64/boot/dts/qcom/msm8937-thermal.dtsi

+30 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -48,6 +48,7 @@ 
		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&tsens0 0>;

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;
@@ -62,6 +63,7 @@ 
		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&tsens0 1>;

		wake-capable-sensor;

		trips {

			active-config0 {

					temperature = <125000>;
@@ -76,6 +78,7 @@ 
		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&tsens0 2>;

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;
@@ -90,6 +93,7 @@ 
		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&tsens0 3>;

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;
@@ -104,6 +108,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&tsens0 4>;

		thermal-governor = "user_space";

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;
@@ -118,6 +123,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&tsens0 5>;

		thermal-governor = "user_space";

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;
@@ -132,6 +138,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&tsens0 6>;

		thermal-governor = "user_space";

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;
@@ -146,6 +153,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&tsens0 7>;

		thermal-governor = "user_space";

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;
@@ -160,6 +168,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&tsens0 8>;

		thermal-governor = "user_space";

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;
@@ -174,6 +183,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&tsens0 9>;

		thermal-governor = "user_space";

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;
@@ -188,6 +198,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&tsens0 10>;

		thermal-governor = "user_space";

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;
@@ -202,6 +213,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&tsens0 10>;

		thermal-governor = "step_wise";

		wake-capable-sensor;

		trips {

			gpu_step_trip: gpu-step-trip {

				temperature = <95000>;
@@ -223,6 +235,7 @@ 
		polling-delay-passive = <50>;

		polling-delay = <100>;

		thermal-governor = "step_wise";

		wake-capable-sensor;

		trips {

			cpu_trip:cpu-trip {

				temperature = <85000>;
@@ -287,6 +300,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&tsens0 5>;

		thermal-governor = "step_wise";

		wake-capable-sensor;

		trips {

			apc1_cpu0_trip: apc1-cpu0-trip {

				temperature = <105000>;
@@ -309,6 +323,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&tsens0 6>;

		thermal-governor = "step_wise";

		wake-capable-sensor;

		trips {

			apc1_cpu1_trip: apc1-cpu1-trip {

				temperature = <105000>;
@@ -331,6 +346,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&tsens0 7>;

		thermal-governor = "step_wise";

		wake-capable-sensor;

		trips {

			apc1_cpu2_trip: apc1-cpu2-trip {

				temperature = <105000>;
@@ -353,6 +369,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&tsens0 8>;

		thermal-governor = "step_wise";

		wake-capable-sensor;

		trips {

			apc1_cpu3_trip: apc1-cpu3-trip {

				temperature = <105000>;
@@ -375,6 +392,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&tsens0 9>;

		thermal-governor = "step_wise";

		wake-capable-sensor;

		trips {

			cpuss0_step_trip: cpuss0-step-trip {

				temperature = <105000>;
@@ -415,6 +433,7 @@ 
		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 0>;

		wake-capable-sensor;

		tracks-low;

		trips {

			aoss0_trip: aoss-trip {
@@ -445,6 +464,7 @@ 
		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 1>;

		wake-capable-sensor;

		tracks-low;

		trips {

			mdm_core_trip: mdm-core-trip {
@@ -475,6 +495,7 @@ 
		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 2>;

		wake-capable-sensor;

		tracks-low;

		trips {

			qdsp_trip: qdsp-trip {
@@ -505,6 +526,7 @@ 
		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 3>;

		wake-capable-sensor;

		tracks-low;

		trips {

			camera_trip: camera-trip {
@@ -535,6 +557,7 @@ 
		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 4>;

		wake-capable-sensor;

		tracks-low;

		trips {

			cpuss1_trip: cpuss1-trip {
@@ -565,6 +588,7 @@ 
		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 5>;

		wake-capable-sensor;

		tracks-low;

		trips {

			cpu0_trip: apc1-cpu0-trip {
@@ -595,6 +619,7 @@ 
		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 6>;

		wake-capable-sensor;

		tracks-low;

		trips {

			cpu1_trip: apc1-cpu1-trip {
@@ -625,6 +650,7 @@ 
		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 7>;

		wake-capable-sensor;

		tracks-low;

		trips {

			cpu2_trip: apc1-cpu2-trip {
@@ -655,6 +681,7 @@ 
		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 8>;

		wake-capable-sensor;

		tracks-low;

		trips {

			cpu3_trip: apc1-cpu3-trip {
@@ -685,6 +712,7 @@ 
		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 9>;

		wake-capable-sensor;

		tracks-low;

		trips {

			cpuss0_lowf_trip: cpuss0-lowf-trip {
@@ -715,6 +743,7 @@ 
		polling-delay = <0>;

		thermal-governor = "low_limits_floor";

		thermal-sensors = <&tsens0 10>;

		wake-capable-sensor;

		tracks-low;

		trips {

			gpu_lowf_trip: gpu-lowf-trip {

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

+6 −0
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&pm8937_vadc 0x11>;

		thermal-governor = "user_space";

		wake-capable-sensor;



		trips {

			active-config0 {
@@ -353,6 +354,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&pm8937_vadc 0x32>;

		thermal-governor = "user_space";

		wake-capable-sensor;



		trips {

			active-config0 {
@@ -368,6 +370,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&pm8937_vadc 0x3c>;

		thermal-governor = "user_space";

		wake-capable-sensor;



		trips {

			active-config0 {
@@ -383,6 +386,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&pm8937_vadc 0x13>;

		thermal-governor = "user_space";

		wake-capable-sensor;



		trips {

			active-config0 {
@@ -398,6 +402,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&pm8937_adc_tm 0x36>;

		thermal-governor = "user_space";

		wake-capable-sensor;



		trips {

			active-config0 {
@@ -413,6 +418,7 @@ 
		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm8937_temp_alarm>;

		wake-capable-sensor;



		trips {

			pm8937_trip0: pm8937-trip0 {

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

+4 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -360,6 +360,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&pm8953_adc_tm 0x32>;

		thermal-governor = "user_space";

		wake-capable-sensor;



		trips {

			active-config0 {
@@ -375,6 +376,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&pm8953_vadc 0x3c>;

		thermal-governor = "user_space";

		wake-capable-sensor;



		trips {

			active-config0 {
@@ -389,6 +391,7 @@ 
		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm8953_tz>;

		wake-capable-sensor;



		trips {

			pm8953_trip0: pm8953-trip0 {

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

+8 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -753,6 +753,7 @@ 
		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&bcl_sensor 0>;

		wake-capable-sensor;



		trips {

			pmi632_ibat_lvl0: ibat-lvl0 {
@@ -768,6 +769,7 @@ 
		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&bcl_sensor 1>;

		wake-capable-sensor;



		trips {

			ibat-lvl1 {
@@ -783,6 +785,7 @@ 
		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&bcl_sensor 2>;

		wake-capable-sensor;

		tracks-low;



		trips {
@@ -799,6 +802,7 @@ 
		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&bcl_sensor 3>;

		wake-capable-sensor;

		tracks-low;



		trips {
@@ -815,6 +819,7 @@ 
		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&bcl_sensor 4>;

		wake-capable-sensor;

		tracks-low;



		trips {
@@ -831,6 +836,7 @@ 
		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&bcl_soc>;

		wake-capable-sensor;

		tracks-low;



		trips {
@@ -847,6 +853,7 @@ 
		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pmi632_tz>;

		wake-capable-sensor;



		trips {

			pmi632_tz_trip0: pmi632-trip0 {

arch/arm64/boot/dts/qcom/sdm439-pm8953.dtsi

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -277,6 +277,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&pm8953_adc_tm 0x36>;

		thermal-governor = "user_space";

		wake-capable-sensor;



		trips {

			active-config0 {