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

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

Merge "ARM: dts: msm: Add BCL configuration for LITO"

parents a2663a43 5c4c527a
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@
#include "lito-pmic-overlay.dtsi"
#include "lito-camera-sensor-cdp.dtsi"
#include "lito-sde-display.dtsi"
#include "lito-thermal-overlay.dtsi"

&soc {

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@
#include "lito-pmic-overlay.dtsi"
#include "lito-camera-sensor-mtp.dtsi"
#include "lito-sde-display.dtsi"
#include "lito-thermal-overlay.dtsi"

&soc {

+1 −0
Original line number Diff line number Diff line
#include "lito-pmic-overlay.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include "lito-audio-overlay.dtsi"
#include "lito-thermal-overlay.dtsi"

&soc {

+245 −0
Original line number Diff line number Diff line
#include <dt-bindings/thermal/thermal.h>

&thermal_zones {
	pm7250b-tz {
		cooling-maps {
			trip0_bat {
				trip = <&pm7250b_trip0>;
				cooling-device =
					<&pm7250b_charger (THERMAL_MAX_LIMIT-1)
						(THERMAL_MAX_LIMIT-1)>;
			};

			trip1_bat {
				trip = <&pm7250b_trip1>;
				cooling-device =
					<&pm7250b_charger THERMAL_MAX_LIMIT
						THERMAL_MAX_LIMIT>;
			};
		};
	};

	pm8150_tz {
		cooling-maps {
			trip0_cpu0 {
				trip = <&pm8150_trip0>;
				cooling-device =
					<&CPU0 THERMAL_MAX_LIMIT
						THERMAL_MAX_LIMIT>;
			};

			trip0_cpu1 {
				trip = <&pm8150_trip0>;
				cooling-device =
					<&CPU1 THERMAL_MAX_LIMIT
						THERMAL_MAX_LIMIT>;
			};

			trip0_cpu2 {
				trip = <&pm8150_trip0>;
				cooling-device =
					<&CPU2 THERMAL_MAX_LIMIT
						THERMAL_MAX_LIMIT>;
			};

			trip0_cpu3 {
				trip = <&pm8150_trip0>;
				cooling-device =
					<&CPU3 THERMAL_MAX_LIMIT
						THERMAL_MAX_LIMIT>;
			};

			trip0_cpu4 {
				trip = <&pm8150_trip0>;
				cooling-device =
					<&CPU4 THERMAL_MAX_LIMIT
						THERMAL_MAX_LIMIT>;
			};

			trip0_cpu5 {
				trip = <&pm8150_trip0>;
				cooling-device =
					<&CPU5 THERMAL_MAX_LIMIT
						THERMAL_MAX_LIMIT>;
			};

			trip0_cpu6 {
				trip = <&pm8150_trip0>;
				cooling-device =
					<&CPU6 THERMAL_MAX_LIMIT
						THERMAL_MAX_LIMIT>;
			};

			trip0_cpu7 {
				trip = <&pm8150_trip0>;
				cooling-device =
					<&CPU7 THERMAL_MAX_LIMIT
						THERMAL_MAX_LIMIT>;
			};

			trip1_cpu1 {
				trip = <&pm8150_trip1>;
				cooling-device = <&cpu1_isolate 1 1>;
			};

			trip1_cpu2 {
				trip = <&pm8150_trip1>;
				cooling-device = <&cpu2_isolate 1 1>;
			};

			trip1_cpu3 {
				trip = <&pm8150_trip1>;
				cooling-device = <&cpu3_isolate 1 1>;
			};

			trip1_cpu4 {
				trip = <&pm8150_trip1>;
				cooling-device = <&cpu4_isolate 1 1>;
			};

			trip1_cpu5 {
				trip = <&pm8150_trip1>;
				cooling-device = <&cpu5_isolate 1 1>;
			};

			trip1_cpu6 {
				trip = <&pm8150_trip1>;
				cooling-device = <&cpu6_isolate 1 1>;
			};

			trip1_cpu7 {
				trip = <&pm8150_trip1>;
				cooling-device = <&cpu7_isolate 1 1>;
			};
		};
	};

	soc {
		cooling-maps {
			soc_cpu6 {
				trip = <&soc_trip>;
				cooling-device = <&cpu6_isolate 1 1>;
			};

			soc_cpu7 {
				trip = <&soc_trip>;
				cooling-device = <&cpu7_isolate 1 1>;
			};
		};
	};

	pm7250b-vbat-lvl0 {
		cooling-maps {
			vbat_cpu6 {
				trip = <&vbat_lvl0>;
				cooling-device = <&cpu6_isolate 1 1>;
			};

			vbat_cpu7 {
				trip = <&vbat_lvl0>;
				cooling-device = <&cpu7_isolate 1 1>;
			};
		};
	};

	pm7250b-vbat-lvl1 {
		cooling-maps {
			vbat_cpu6 {
				trip = <&vbat_lvl1>;
				cooling-device = <&cpu6_isolate 1 1>;
			};

			vbat_cpu7 {
				trip = <&vbat_lvl1>;
				cooling-device = <&cpu7_isolate 1 1>;
			};
		};
	};

	pm7250b-vbat-lvl2 {
		cooling-maps {
			vbat_cpu6 {
				trip = <&vbat_lvl2>;
				cooling-device = <&cpu6_isolate 1 1>;
			};

			vbat_cpu7 {
				trip = <&vbat_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 {
		disable-thermal-zone;
		cooling-maps {
			vph_cpu6 {
				trip = <&vph_lvl0>;
				cooling-device = <&cpu6_isolate 1 1>;
			};

			vph_cpu7 {
				trip = <&vph_lvl0>;
				cooling-device = <&cpu7_isolate 1 1>;
			};
		};
	};

	pm8150l-vph-lvl1 {
		disable-thermal-zone;
		cooling-maps {
			vph_cpu6 {
				trip = <&vph_lvl1>;
				cooling-device = <&cpu6_isolate 1 1>;
			};

			vph_cpu7 {
				trip = <&vph_lvl1>;
				cooling-device = <&cpu7_isolate 1 1>;
			};
		};
	};

	pm8150l-vph-lvl2 {
		disable-thermal-zone;
		cooling-maps {
			vph_cpu6 {
				trip = <&vph_lvl2>;
				cooling-device = <&cpu6_isolate 1 1>;
			};

			vph_cpu7 {
				trip = <&vph_lvl2>;
				cooling-device = <&cpu7_isolate 1 1>;
			};
		};
	};
};
+220 −74
Original line number Diff line number Diff line
@@ -45,6 +45,94 @@
	};
};

&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_skin0: modem_skin0 {
				qcom,qmi-dev-name = "modem_skin0";
				#cooling-cells = <2>;
			};

			modem_skin1: modem_skin1 {
				qcom,qmi-dev-name = "modem_skin1";
				#cooling-cells = <2>;
			};

			modem_skin2: modem_skin2 {
				qcom,qmi-dev-name = "modem_skin2";
				#cooling-cells = <2>;
			};

			modem_skin3: modem_skin3 {
				qcom,qmi-dev-name = "modem_skin3";
				#cooling-cells = <2>;
			};

			modem_mmw0: modem_mmw0 {
				qcom,qmi-dev-name = "mmw0";
				#cooling-cells = <2>;
			};

			modem_mmw1: modem_mmw1 {
				qcom,qmi-dev-name = "mmw1";
				#cooling-cells = <2>;
			};

			modem_mmw2: modem_mmw2 {
				qcom,qmi-dev-name = "mmw2";
				#cooling-cells = <2>;
			};

			modem_mmw3: modem_mmw3 {
				qcom,qmi-dev-name = "mmw3";
				#cooling-cells = <2>;
			};

			modem_bcl: modem_bcl {
				qcom,qmi-dev-name = "vbatt_low";
				#cooling-cells = <2>;
			};
		};
	};

	lmh_cpu_vdd0: qcom,lmh-cpu-vdd@18358800 {
		compatible = "qcom,lmh-cpu-vdd";
		reg =  <0x18358800 0x1000>;
		#cooling-cells = <2>;
	};

	lmh_cpu_vdd1: qcom,lmh-cpu-vdd@18350800 {
		compatible = "qcom,lmh-cpu-vdd";
		reg =  <0x18350800 0x1000>;
		#cooling-cells = <2>;
	};

};

&thermal_zones {
	aoss0-usr {
		polling-delay-passive = <0>;
@@ -625,6 +713,14 @@
				type = "passive";
			};
		};

		cooling-maps {
			gpu_cdev {
				trip = <&gpu_trip0>;
				cooling-device = <&msm_gpu THERMAL_NO_LIMIT
							THERMAL_NO_LIMIT>;
			};
		};
	};

	cpu-0-max-step {
@@ -875,6 +971,34 @@
		};
	};

	aoss0-lowc {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 0>;
		thermal-governor = "low_limits_cap";
		wake-capable-sensor;
		tracks-low;
		trips {
			aoss0_cap: aoss0-trip {
				temperature = <5000>;
				hysteresis = <5000>;
				type = "passive";
			};
		};

		cooling-maps {
			lmh_cpu0_cdev {
				trip = <&aoss0_cap>;
				cooling-device = <&lmh_cpu_vdd0 1 1>;
			};

			lmh_cpu6_cdev {
				trip = <&aoss0_cap>;
				cooling-device = <&lmh_cpu_vdd1 1 1>;
			};
		};
	};

	aoss0-lowf {
		polling-delay-passive = <0>;
		polling-delay = <0>;
@@ -891,27 +1015,37 @@
		};

		cooling-maps {
			cpu0_cdev {
			lpi_cx_vdd_cdev {
				trip = <&aoss0_trip>;
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT-4)
							(THERMAL_MAX_LIMIT-4)>;
				cooling-device = <&lpi_cx_cdev 0 0>;
			};
		};
	};

			cpu6_cdev {
				trip = <&aoss0_trip>;
				cooling-device = <&CPU6 (THERMAL_MAX_LIMIT-3)
							(THERMAL_MAX_LIMIT-3)>;
	cpu-1-3-lowc {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 12>;
		thermal-governor = "low_limits_cap";
		wake-capable-sensor;
		tracks-low;
		trips {
			cpu_1_3_cap: cpu-1-3-trip {
				temperature = <5000>;
				hysteresis = <5000>;
				type = "passive";
			};
		};

			cpu7_cdev {
				trip = <&aoss0_trip>;
				cooling-device = <&CPU7 (THERMAL_MAX_LIMIT-3)
							(THERMAL_MAX_LIMIT-3)>;
		cooling-maps {
			lmh_cpu0_cdev {
				trip = <&cpu_1_3_cap>;
				cooling-device = <&lmh_cpu_vdd0 1 1>;
			};

			lpi_cx_vdd_cdev {
				trip = <&aoss0_trip>;
				cooling-device = <&lpi_cx_cdev 0 0>;
			lmh_cpu6_cdev {
				trip = <&cpu_1_3_cap>;
				cooling-device = <&lmh_cpu_vdd1 1 1>;
			};
		};
	};
@@ -932,27 +1066,37 @@
		};

		cooling-maps {
			cpu0_cdev {
			lpi_cx_vdd_cdev {
				trip = <&cpu_1_3_trip>;
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT-4)
							(THERMAL_MAX_LIMIT-4)>;
				cooling-device = <&lpi_cx_cdev 0 0>;
			};
		};
	};

			cpu6_cdev {
				trip = <&cpu_1_3_trip>;
				cooling-device = <&CPU6 (THERMAL_MAX_LIMIT-3)
							(THERMAL_MAX_LIMIT-3)>;
	gpuss-0-lowc {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 13>;
		thermal-governor = "low_limits_cap";
		wake-capable-sensor;
		tracks-low;
		trips {
			gpuss0_cap: gpuss0-trip {
				temperature = <5000>;
				hysteresis = <5000>;
				type = "passive";
			};
		};

			cpu7_cdev {
				trip = <&cpu_1_3_trip>;
				cooling-device = <&CPU7 (THERMAL_MAX_LIMIT-3)
							(THERMAL_MAX_LIMIT-3)>;
		cooling-maps {
			lmh_cpu0_cdev {
				trip = <&gpuss0_cap>;
				cooling-device = <&lmh_cpu_vdd0 1 1>;
			};

			lpi_cx_vdd_cdev {
				trip = <&cpu_1_3_trip>;
				cooling-device = <&lpi_cx_cdev 0 0>;
			lmh_cpu6_cdev {
				trip = <&gpuss0_cap>;
				cooling-device = <&lmh_cpu_vdd1 1 1>;
			};
		};
	};
@@ -973,27 +1117,37 @@
		};

		cooling-maps {
			cpu0_cdev {
			lpi_cx_vdd_cdev {
				trip = <&gpuss0_trip>;
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT-4)
							(THERMAL_MAX_LIMIT-4)>;
				cooling-device = <&lpi_cx_cdev 0 0>;
			};
		};
	};

			cpu6_cdev {
				trip = <&gpuss0_trip>;
				cooling-device = <&CPU6 (THERMAL_MAX_LIMIT-3)
							(THERMAL_MAX_LIMIT-3)>;
	camera-lowc {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens1 7>;
		thermal-governor = "low_limits_cap";
		wake-capable-sensor;
		tracks-low;
		trips {
			camera_cap: camera-trip {
				temperature = <5000>;
				hysteresis = <5000>;
				type = "passive";
			};
		};

			cpu7_cdev {
				trip = <&gpuss0_trip>;
				cooling-device = <&CPU7 (THERMAL_MAX_LIMIT-3)
							(THERMAL_MAX_LIMIT-3)>;
		cooling-maps {
			lmh_cpu0_cdev {
				trip = <&camera_cap>;
				cooling-device = <&lmh_cpu_vdd0 1 1>;
			};

			lpi_cx_vdd_cdev {
				trip = <&gpuss0_trip>;
				cooling-device = <&lpi_cx_cdev 0 0>;
			lmh_cpu6_cdev {
				trip = <&camera_cap>;
				cooling-device = <&lmh_cpu_vdd1 1 1>;
			};
		};
	};
@@ -1014,27 +1168,37 @@
		};

		cooling-maps {
			cpu0_cdev {
			lpi_cx_vdd_cdev {
				trip = <&camera_trip>;
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT-4)
							(THERMAL_MAX_LIMIT-4)>;
				cooling-device = <&lpi_cx_cdev 0 0>;
			};
		};
	};

			cpu6_cdev {
				trip = <&camera_trip>;
				cooling-device = <&CPU6 (THERMAL_MAX_LIMIT-3)
							(THERMAL_MAX_LIMIT-3)>;
	mdm-scl-lowc {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens1 9>;
		thermal-governor = "low_limits_cap";
		wake-capable-sensor;
		tracks-low;
		trips {
			mdm_scl_cap: mdm-scl-trip {
				temperature = <5000>;
				hysteresis = <5000>;
				type = "passive";
			};
		};

			cpu7_cdev {
				trip = <&camera_trip>;
				cooling-device = <&CPU7 (THERMAL_MAX_LIMIT-3)
							(THERMAL_MAX_LIMIT-3)>;
		cooling-maps {
			lmh_cpu0_cdev {
				trip = <&mdm_scl_cap>;
				cooling-device = <&lmh_cpu_vdd0 1 1>;
			};

			lpi_cx_vdd_cdev {
				trip = <&camera_trip>;
				cooling-device = <&lpi_cx_cdev 0 0>;
			lmh_cpu6_cdev {
				trip = <&mdm_scl_cap>;
				cooling-device = <&lmh_cpu_vdd1 1 1>;
			};
		};
	};
@@ -1055,24 +1219,6 @@
		};

		cooling-maps {
			cpu0_cdev {
				trip = <&mdm_scl_trip>;
				cooling-device = <&CPU0 (THERMAL_MAX_LIMIT-4)
							(THERMAL_MAX_LIMIT-4)>;
			};

			cpu6_cdev {
				trip = <&mdm_scl_trip>;
				cooling-device = <&CPU6 (THERMAL_MAX_LIMIT-3)
							(THERMAL_MAX_LIMIT-3)>;
			};

			cpu7_cdev {
				trip = <&mdm_scl_trip>;
				cooling-device = <&CPU7 (THERMAL_MAX_LIMIT-3)
							(THERMAL_MAX_LIMIT-3)>;
			};

			lpi_cx_vdd_cdev {
				trip = <&mdm_scl_trip>;
				cooling-device = <&lpi_cx_cdev 0 0>;
Loading