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

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

Merge "ARM: dts: msm: Add QMI cooling device for ATOLL"

parents ca37171c 263b5a40

Documentation/devicetree/bindings/thermal/qcom-bcl-pmic5.txt

+5 −7
Original line number Diff line number Diff line
@@ -26,11 +26,9 @@ Required Parameters: 
		interrupt names will be used by the drivers to identify the

		interrupts, instead of specifying the ID's. bcl driver will

		accept these standard interrupts.

		"bcl-ibat-lvl0",

		"bcl-ibat-lvl1",

		"bcl-vbat-lvl0",

		"bcl-vbat-lvl1",

		"bcl-vbat-lvl2",

		"bcl-lvl0",

		"bcl-lvl1",

		"bcl-lvl2",



Optional Parameters:

- qcom,ibat-use-qg-adc-5a: This optional property is used to divide Ibat
@@ -44,7 +42,7 @@ Example: 
			reg = <0x4200 0x100>;

			interrupts = <0x2 0x42 0x0 IRQ_TYPE_NONE>,

					<0x2 0x42 0x1 IRQ_TYPE_NONE>;

			interrupt-names = "bcl-ibat-lvl0",

						"bcl-vbat-lvl0";

			interrupt-names = "bcl-lvl0",

						"bcl-lvl1";

			qcom,ibat-use-qg-adc-5a;

		};

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

+53 −0
Original line number Diff line number Diff line
@@ -13,6 +13,59 @@ 


#include <dt-bindings/thermal/thermal.h>



&soc {

	qmi-tmd-devices {

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



		modem {

			qcom,instance-id = <0x0>;



			modem_pa: modem_pa {

				qcom,qmi-dev-name = "pa";

				#cooling-cells = <2>;

			};



			modem_proc: modem_proc {

				qcom,qmi-dev-name = "modem";

				#cooling-cells = <2>;

			};



			modem_current: modem_current {

				qcom,qmi-dev-name = "modem_current";

				#cooling-cells = <2>;

			};



			modem_skin: modem_skin {

				qcom,qmi-dev-name = "modem_skin";

				#cooling-cells = <2>;

			};



			modem_vdd: modem_vdd {

				qcom,qmi-dev-name = "cpuv_restriction_cold";

				#cooling-cells = <2>;

			};

		};



		adsp {

			qcom,instance-id = <0x1>;



			adsp_vdd: adsp_vdd {

				qcom,qmi-dev-name = "cpuv_restriction_cold";

				#cooling-cells = <2>;

			};

		};



		cdsp {

			qcom,instance-id = <0x43>;



			cdsp_vdd: cdsp_vdd {

				qcom,qmi-dev-name = "cpuv_restriction_cold";

				#cooling-cells = <2>;

			};

		};

	};

};



&thermal_zones {

	aoss-0-usr {

		polling-delay-passive = <0>;

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

+53 −9
Original line number Diff line number Diff line
@@ -449,15 +449,11 @@ 
			compatible = "qcom,bcl-v5";

			reg = <0x1d00 0x100>;

			interrupts = <0x0 0x1d 0x0 IRQ_TYPE_NONE>,

					<0x0 0x1d 0x1 IRQ_TYPE_NONE>,

					<0x0 0x1d 0x0 IRQ_TYPE_NONE>,

					<0x0 0x1d 0x1 IRQ_TYPE_NONE>,

					<0x0 0x1d 0x2 IRQ_TYPE_NONE>;

			interrupt-names = "bcl-ibat-lvl0",

						"bcl-ibat-lvl1",

						"bcl-vbat-lvl0",

						"bcl-vbat-lvl1",

						"bcl-vbat-lvl2";

			interrupt-names = "bcl-lvl0",

						"bcl-lvl1",

						"bcl-lvl2";

			#thermal-sensor-cells = <1>;

		};
@@ -564,7 +560,7 @@ 
	};



	pm6150-ibat-lvl0 {

		polling-delay-passive = <100>;

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm6150_bcl 0>;
@@ -596,7 +592,7 @@ 
	};



	pm6150-vbat-lvl0 {

		polling-delay-passive = <100>;

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&pm6150_bcl 2>;
@@ -646,6 +642,54 @@ 
		};

	};



	pm6150-bcl-lvl0 {

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm6150_bcl 5>;

		wake-capable-sensor;



		trips {

			bcl_lvl0: bcl-lvl0 {

				temperature = <1>;

				hysteresis = <1>;

				type = "passive";

			};

		};

	};



	pm6150-bcl-lvl1 {

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm6150_bcl 6>;

		wake-capable-sensor;



		trips {

			bcl_lvl1: bcl-lvl1 {

				temperature = <1>;

				hysteresis = <1>;

				type = "passive";

			};

		};

	};



	pm6150-bcl-lvl2 {

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm6150_bcl 7>;

		wake-capable-sensor;



		trips {

			bcl_lvl2: bcl-lvl2 {

				temperature = <1>;

				hysteresis = <1>;

				type = "passive";

			};

		};

	};



	soc {

		polling-delay-passive = <100>;

		polling-delay = <0>;

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

+51 −3
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ 
			interrupts = <0x4 0x3d 0x0 IRQ_TYPE_NONE>,

					<0x4 0x3d 0x1 IRQ_TYPE_NONE>,

					<0x4 0x3d 0x2 IRQ_TYPE_NONE>;

			interrupt-names = "bcl-vbat-lvl0",

						"bcl-vbat-lvl1",

						"bcl-vbat-lvl2";

			interrupt-names = "bcl-lvl0",

						"bcl-lvl1",

						"bcl-lvl2";

			#thermal-sensor-cells = <1>;

		};
@@ -511,4 +511,52 @@ 
			};

		};

	};



	pm6150l-bcl-lvl0 {

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm6150l_bcl 5>;

		wake-capable-sensor;



		trips {

			l_bcl_lvl0: l-bcl-lvl0 {

				temperature = <1>;

				hysteresis = <1>;

				type = "passive";

			};

		};

	};



	pm6150l-bcl-lvl1 {

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm6150l_bcl 6>;

		wake-capable-sensor;



		trips {

			l_bcl_lvl1: l-bcl-lvl1 {

				temperature = <1>;

				hysteresis = <1>;

				type = "passive";

			};

		};

	};



	pm6150l-bcl-lvl2 {

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm6150l_bcl 7>;

		wake-capable-sensor;



		trips {

			l_bcl_lvl2: l-bcl-lvl2 {

				temperature = <1>;

				hysteresis = <1>;

				type = "passive";

			};

		};

	};

};

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

+56 −12
Original line number Diff line number Diff line
@@ -365,15 +365,11 @@ 
			compatible = "qcom,bcl-v5";

			reg = <0x1d00 0x100>;

			interrupts = <0x2 0x1d 0x0 IRQ_TYPE_NONE>,

					<0x2 0x1d 0x1 IRQ_TYPE_NONE>,

					<0x2 0x1d 0x0 IRQ_TYPE_NONE>,

					<0x2 0x1d 0x1 IRQ_TYPE_NONE>,

					<0x2 0x1d 0x2 IRQ_TYPE_NONE>;

			interrupt-names = "bcl-ibat-lvl0",

						"bcl-ibat-lvl1",

						"bcl-vbat-lvl0",

						"bcl-vbat-lvl1",

						"bcl-vbat-lvl2";

			interrupt-names = "bcl-lvl0",

						"bcl-lvl1",

						"bcl-lvl2";

			#thermal-sensor-cells = <1>;

		};
@@ -603,7 +599,7 @@ 
	};



	pm8150b-ibat-lvl0 {

		polling-delay-passive = <100>;

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm8150b_bcl 0>;
@@ -619,7 +615,7 @@ 
	};



	pm8150b-ibat-lvl1 {

		polling-delay-passive = <100>;

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm8150b_bcl 1>;
@@ -635,7 +631,7 @@ 
	};



	pm8150b-vbat-lvl0 {

		polling-delay-passive = <100>;

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&pm8150b_bcl 2>;
@@ -652,7 +648,7 @@ 
	};



	pm8150b-vbat-lvl1 {

		polling-delay-passive = <100>;

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&pm8150b_bcl 3>;
@@ -669,7 +665,7 @@ 
	};



	pm8150b-vbat-lvl2 {

		polling-delay-passive = <100>;

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&pm8150b_bcl 4>;
@@ -685,6 +681,54 @@ 
		};

	};



	pm8150b-bcl-lvl0 {

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm8150b_bcl 5>;

		wake-capable-sensor;



		trips {

			b_bcl_lvl0: b-bcl-lvl0 {

				temperature = <1>;

				hysteresis = <1>;

				type = "passive";

			};

		};

	};



	pm8150b-bcl-lvl1 {

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm8150b_bcl 6>;

		wake-capable-sensor;



		trips {

			b_bcl_lvl1: b-bcl-lvl1 {

				temperature = <1>;

				hysteresis = <1>;

				type = "passive";

			};

		};

	};



	pm8150b-bcl-lvl2 {

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm8150b_bcl 7>;

		wake-capable-sensor;



		trips {

			b_bcl_lvl2: b-bcl-lvl2 {

				temperature = <1>;

				hysteresis = <1>;

				type = "passive";

			};

		};

	};



	soc {

		polling-delay-passive = <100>;

		polling-delay = <0>;