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

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

Merge "ARM: dts: qcom: Add die temperature zone config for PM6125 and PMI632"

parents d556d77e 40465f0a

qcom/bengal-idp.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <dt-bindings/iio/qcom,spmi-vadc.h>

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

#include "bengal-audio-overlay.dtsi"

#include "bengal-thermal-overlay.dtsi"



&soc {

	mtp_batterydata: qcom,battery-data {

qcom/bengal-qrd.dtsi

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

#include <dt-bindings/iio/qcom,spmi-vadc.h>

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

#include "bengal-thermal-overlay.dtsi"



&soc {

	qrd_batterydata: qcom,battery-data {

qcom/bengal-regulator.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -46,6 +46,14 @@ 
					<RPM_SMD_REGULATOR_LEVEL_BINNING>;

			qcom,use-voltage-level;

		};



		cx_cdev: cx-cdev-lvl {

			compatible = "qcom,regulator-cooling-device";

			regulator-cdev-supply = <&VDD_CX_FLOOR_LEVEL>;

			regulator-levels = <RPM_SMD_REGULATOR_LEVEL_NOM

					RPM_SMD_REGULATOR_LEVEL_NONE>;

			#cooling-cells = <2>;

		};

	};



	/* PM6125 S5 - VDD_MX/WCSS_MX supply */
@@ -88,6 +96,14 @@ 
					<RPM_SMD_REGULATOR_LEVEL_BINNING>;

			qcom,use-voltage-level;

		};



		mx_cdev: mx-cdev-lvl {

			compatible = "qcom,regulator-cooling-device";

			regulator-cdev-supply = <&VDD_MX_LEVEL>;

			regulator-levels = <RPM_SMD_REGULATOR_LEVEL_NOM

					RPM_SMD_REGULATOR_LEVEL_NONE>;

			#cooling-cells = <2>;

		};

	};



	rpm-regulator-smpa6 {

qcom/bengal-rumi.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -84,6 +84,11 @@ 
	/delete-node/ rpm-regulator-ldoa24;

};



&thermal_zones {

	/delete-node/ mapss-lowf;

	/delete-node/ camera-lowf;

};



 #include "bengal-stub-regulator.dtsi"



&sdhc_1 {

qcom/bengal-thermal-overlay.dtsi

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



&thermal_zones {

	pmi632-tz {

		cooling-maps {

			trip0_bat {

				trip = <&pmi632_trip0>;

				cooling-device =

					<&pmi632_charger (THERMAL_MAX_LIMIT-1)

						(THERMAL_MAX_LIMIT-1)>;

			};



			trip1_bat {

				trip = <&pmi632_trip1>;

				cooling-device =

					<&pmi632_charger THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};

	};



	pm6125-tz {

		cooling-maps {

			trip0_cpu0 {

				trip = <&pm6125_trip0>;

				cooling-device =

					<&CPU0 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};



			trip0_cpu4 {

				trip = <&pm6125_trip0>;

				cooling-device =

					<&CPU4 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};



			trip1_cpu1 {

				trip = <&pm6125_trip1>;

				cooling-device = <&cpu1_isolate 1 1>;

			};



			trip1_cpu2 {

				trip = <&pm6125_trip1>;

				cooling-device = <&cpu2_isolate 1 1>;

			};



			trip1_cpu3 {

				trip = <&pm6125_trip1>;

				cooling-device = <&cpu3_isolate 1 1>;

			};



			trip1_cpu4 {

				trip = <&pm6125_trip1>;

				cooling-device = <&cpu4_isolate 1 1>;

			};



			trip1_cpu5 {

				trip = <&pm6125_trip1>;

				cooling-device = <&cpu5_isolate 1 1>;

			};



			trip1_cpu6 {

				trip = <&pm6125_trip1>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			trip1_cpu7 {

				trip = <&pm6125_trip1>;

				cooling-device = <&cpu7_isolate 1 1>;

			};

		};

	};

};