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

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

Merge "ARM: dts: qcom: Add BCL mitigation level config for lito"

parents 5778b55c 863731ef

qcom/kona-thermal-overlay.dtsi

+20 −58
Original line number Diff line number Diff line
@@ -29,137 +29,99 @@ 
		};

	};



	pm8150b-vbat-lvl0 {

	pm8150b-bcl-lvl0 {

		cooling-maps {

			vbat_cpu4 {

				trip = <&vbat_lvl0>;

				trip = <&b_bcl_lvl0>;

				cooling-device = <&cpu4_isolate 1 1>;

			};



			vbat_cpu5 {

				trip = <&vbat_lvl0>;

				trip = <&b_bcl_lvl0>;

				cooling-device = <&cpu5_isolate 1 1>;

			};



			vbat_gpu0 {

				trip = <&vbat_lvl0>;

				trip = <&b_bcl_lvl0>;

				cooling-device = <&msm_gpu 2 2>;

			};

		};

	};



	pm8150b-vbat-lvl1 {

	pm8150b-bcl-lvl1 {

		cooling-maps {

			vbat_cpu6 {

				trip = <&vbat_lvl1>;

				trip = <&b_bcl_lvl1>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			vbat_cpu7 {

				trip = <&vbat_lvl1>;

				trip = <&b_bcl_lvl1>;

				cooling-device = <&cpu7_isolate 1 1>;

			};



			vbat_gpu1 {

				trip = <&vbat_lvl1>;

				trip = <&b_bcl_lvl1>;

				cooling-device = <&msm_gpu 4 4>;

			};

		};

	};



	pm8150b-vbat-lvl2 {

	pm8150b-bcl-lvl2 {

		cooling-maps {

			vbat_gpu2 {

				trip = <&vbat_lvl2>;

				trip = <&b_bcl_lvl2>;

				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT

							THERMAL_MAX_LIMIT>;

			};

		};

	};



	pm8150b-ibat-lvl0 {

		cooling-maps {

			ibat_cpu4 {

				trip = <&ibat_lvl0>;

				cooling-device = <&cpu4_isolate 1 1>;

			};



			ibat_cpu5 {

				trip = <&ibat_lvl0>;

				cooling-device = <&cpu5_isolate 1 1>;

			};



			ibat_gpu0 {

				trip = <&ibat_lvl0>;

				cooling-device = <&msm_gpu 2 2>;

			};

		};

	};



	pm8150b-ibat-lvl1 {

		cooling-maps {

			ibat_cpu6 {

				trip = <&ibat_lvl1>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			ibat_cpu7 {

				trip = <&ibat_lvl1>;

				cooling-device = <&cpu7_isolate 1 1>;

			};



			ibat_gpu1 {

				trip = <&ibat_lvl1>;

				cooling-device = <&msm_gpu 4 4>;

			};

		};

	};



	pm8150l-vph-lvl0 {

	pm8150l-bcl-lvl0 {

		disable-thermal-zone;

		cooling-maps {

			vph_cpu4 {

				trip = <&vph_lvl0>;

				trip = <&l_bcl_lvl0>;

				cooling-device = <&cpu4_isolate 1 1>;

			};



			vph_cpu5 {

				trip = <&vph_lvl0>;

				trip = <&l_bcl_lvl0>;

				cooling-device = <&cpu5_isolate 1 1>;

			};



			vph_gpu0 {

				trip = <&vph_lvl0>;

				trip = <&l_bcl_lvl0>;

				cooling-device = <&msm_gpu 2 2>;

			};

		};

	};



	pm8150l-vph-lvl1 {

	pm8150l-bcl-lvl1 {

		disable-thermal-zone;

		cooling-maps {

			vph_cpu6 {

				trip = <&vph_lvl1>;

				trip = <&l_bcl_lvl1>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			vph_cpu7 {

				trip = <&vph_lvl1>;

				trip = <&l_bcl_lvl1>;

				cooling-device = <&cpu7_isolate 1 1>;

			};



			vph_gpu1 {

				trip = <&vph_lvl1>;

				trip = <&l_bcl_lvl1>;

				cooling-device = <&msm_gpu 4 4>;

			};

		};

	};



	pm8150l-vph-lvl2 {

	pm8150l-bcl-lvl2 {

		disable-thermal-zone;

		cooling-maps {

			vph_gpu2 {

				trip = <&vph_lvl2>;

				trip = <&l_bcl_lvl2>;

				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT

							THERMAL_MAX_LIMIT>;

			};

qcom/lito-thermal-overlay.dtsi

+24 −52
Original line number Diff line number Diff line
@@ -128,116 +128,88 @@ 
		};

	};



	pm7250b-vbat-lvl0 {

	pm7250b-bcl-lvl0 {

		cooling-maps {

			vbat_cpu6 {

				trip = <&vbat_lvl0>;

			lbat0_cpu6 {

				trip = <&b_bcl_lvl0>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			vbat_cpu7 {

				trip = <&vbat_lvl0>;

			lbat0_cpu7 {

				trip = <&b_bcl_lvl0>;

				cooling-device = <&cpu7_isolate 1 1>;

			};

		};

	};



	pm7250b-vbat-lvl1 {

	pm7250b-bcl-lvl1 {

		cooling-maps {

			vbat_cpu6 {

				trip = <&vbat_lvl1>;

			lbat1_cpu6 {

				trip = <&b_bcl_lvl1>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			vbat_cpu7 {

				trip = <&vbat_lvl1>;

			lbat1_cpu7 {

				trip = <&b_bcl_lvl1>;

				cooling-device = <&cpu7_isolate 1 1>;

			};

		};

	};



	pm7250b-vbat-lvl2 {

	pm7250b-bcl-lvl2 {

		cooling-maps {

			vbat_cpu6 {

				trip = <&vbat_lvl2>;

			lbat2_cpu6 {

				trip = <&b_bcl_lvl2>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			vbat_cpu7 {

				trip = <&vbat_lvl2>;

			lbat2_cpu7 {

				trip = <&b_bcl_lvl2>;

				cooling-device = <&cpu7_isolate 1 1>;

			};

		};

	};



	pm7250b-ibat-lvl0 {

		cooling-maps {

			ibat_cpu6 {

				trip = <&ibat_lvl0>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			ibat_cpu7 {

				trip = <&ibat_lvl0>;

				cooling-device = <&cpu7_isolate 1 1>;

			};

		};

	};



	pm7250b-ibat-lvl1 {

		cooling-maps {

			ibat_cpu6 {

				trip = <&ibat_lvl1>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			ibat_cpu7 {

				trip = <&ibat_lvl1>;

				cooling-device = <&cpu7_isolate 1 1>;

			};

		};

	};



	pm8150l-vph-lvl0 {

	pm8150l-bcl-lvl0 {

		disable-thermal-zone;

		cooling-maps {

			vph_cpu6 {

				trip = <&vph_lvl0>;

				trip = <&l_bcl_lvl0>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			vph_cpu7 {

				trip = <&vph_lvl0>;

				trip = <&l_bcl_lvl0>;

				cooling-device = <&cpu7_isolate 1 1>;

			};

		};

	};



	pm8150l-vph-lvl1 {

	pm8150l-bcl-lvl1 {

		disable-thermal-zone;

		cooling-maps {

			vph_cpu6 {

				trip = <&vph_lvl1>;

				trip = <&l_bcl_lvl1>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			vph_cpu7 {

				trip = <&vph_lvl1>;

				trip = <&l_bcl_lvl1>;

				cooling-device = <&cpu7_isolate 1 1>;

			};

		};

	};



	pm8150l-vph-lvl2 {

	pm8150l-bcl-lvl2 {

		disable-thermal-zone;

		cooling-maps {

			vph_cpu6 {

				trip = <&vph_lvl2>;

				trip = <&l_bcl_lvl2>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			vph_cpu7 {

				trip = <&vph_lvl2>;

				trip = <&l_bcl_lvl2>;

				cooling-device = <&cpu7_isolate 1 1>;

			};

		};

qcom/pm7250b.dtsi

+53 −12
Original line number Diff line number Diff line
@@ -425,15 +425,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>;

		};
@@ -488,7 +484,7 @@ 
	};



	pm7250b-ibat-lvl0 {

		polling-delay-passive = <100>;

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm7250b_bcl 0>;
@@ -504,7 +500,7 @@ 
	};



	pm7250b-ibat-lvl1 {

		polling-delay-passive = <100>;

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm7250b_bcl 1>;
@@ -520,7 +516,7 @@ 
	};



	pm7250b-vbat-lvl0 {

		polling-delay-passive = <100>;

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&pm7250b_bcl 2>;
@@ -537,7 +533,7 @@ 
	};



	pm7250b-vbat-lvl1 {

		polling-delay-passive = <100>;

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&pm7250b_bcl 3>;
@@ -554,7 +550,7 @@ 
	};



	pm7250b-vbat-lvl2 {

		polling-delay-passive = <100>;

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&pm7250b_bcl 4>;
@@ -570,6 +566,51 @@ 
		};

	};



	pm7250b-bcl-lvl0 {

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm7250b_bcl 5>;



		trips {

			b_bcl_lvl0: b-bcl-lvl0 {

				temperature = <1>;

				hysteresis = <1>;

				type = "passive";

			};

		};

	};



	pm7250b-bcl-lvl1 {

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm7250b_bcl 6>;



		trips {

			b_bcl_lvl1: b-bcl-lvl1 {

				temperature = <1>;

				hysteresis = <1>;

				type = "passive";

			};

		};

	};



	pm7250b-bcl-lvl2 {

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm7250b_bcl 7>;



		trips {

			b_bcl_lvl2: b-bcl-lvl2 {

				temperature = <1>;

				hysteresis = <1>;

				type = "passive";

			};

		};

	};



	soc {

		polling-delay-passive = <100>;

		polling-delay = <0>;

qcom/pm8150b.dtsi

+53 −12
Original line number Diff line number Diff line
@@ -264,15 +264,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>;

		};
@@ -579,7 +575,7 @@ 
	};



	pm8150b-ibat-lvl0 {

		polling-delay-passive = <100>;

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm8150b_bcl 0>;
@@ -594,7 +590,7 @@ 
	};



	pm8150b-ibat-lvl1 {

		polling-delay-passive = <100>;

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm8150b_bcl 1>;
@@ -609,7 +605,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>;
@@ -625,7 +621,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>;
@@ -641,7 +637,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>;
@@ -656,6 +652,51 @@ 
		};

	};



	pm8150b-bcl-lvl0 {

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm8150b_bcl 5>;



		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>;



		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>;



		trips {

			b_bcl_lvl2: b-bcl-lvl2 {

				temperature = <1>;

				hysteresis = <1>;

				type = "passive";

			};

		};

	};



	soc {

		polling-delay-passive = <100>;

		polling-delay = <0>;

qcom/pm8150l.dtsi

+51 −6
Original line number Diff line number Diff line
@@ -103,9 +103,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>;

		};
@@ -457,7 +457,7 @@ 
	};



	pm8150l-vph-lvl0 {

		polling-delay-passive = <100>;

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&pm8150l_bcl 2>;
@@ -473,7 +473,7 @@ 
	};



	pm8150l-vph-lvl1 {

		polling-delay-passive = <100>;

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&pm8150l_bcl 3>;
@@ -489,7 +489,7 @@ 
	};



	pm8150l-vph-lvl2 {

		polling-delay-passive = <100>;

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&pm8150l_bcl 4>;
@@ -503,4 +503,49 @@ 
			};

		};

	};



	pm8150l-bcl-lvl0 {

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm8150l_bcl 5>;



		trips {

			l_bcl_lvl0: l-bcl-lvl0 {

				temperature = <1>;

				hysteresis = <1>;

				type = "passive";

			};

		};

	};



	pm8150l-bcl-lvl1 {

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm8150l_bcl 6>;



		trips {

			l_bcl_lvl1: l-bcl-lvl1 {

				temperature = <1>;

				hysteresis = <1>;

				type = "passive";

			};

		};

	};



	pm8150l-bcl-lvl2 {

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm8150l_bcl 7>;



		trips {

			l_bcl_lvl2: l-bcl-lvl2 {

				temperature = <1>;

				hysteresis = <1>;

				type = "passive";

			};

		};

	};

};