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

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

Merge "Revert "ARM: dts: msm: Disable pmic thermal zone cofiguration""

parents f425c004 e600f3e6
Loading
Loading
Loading
Loading
+0 −8
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@

&thermal_zones {
	socd {
		disable-thermal-zone;
		cooling-maps {
			socd_cpu4 {
				trip = <&socd_trip>;
@@ -35,7 +34,6 @@
	};

	pm8350b-bcl-lvl0 {
		disable-thermal-zone;
		cooling-maps {
			vbat_cpu4 {
				trip = <&b_bcl_lvl0>;
@@ -60,7 +58,6 @@
	};

	pm8350b-bcl-lvl1 {
		disable-thermal-zone;
		cooling-maps {
			vbat_cpu6 {
				trip = <&b_bcl_lvl1>;
@@ -85,7 +82,6 @@
	};

	pm8350b-bcl-lvl2 {
		disable-thermal-zone;
		cooling-maps {
			vbat_gpu2 {
				trip = <&b_bcl_lvl2>;
@@ -169,7 +165,6 @@
	};

	pm8350b_tz {
		disable-thermal-zone;
		cooling-maps {
			battery_cdev {
				trip = <&pm8350b_trip0>;
@@ -181,7 +176,6 @@
	};

	pm7325_tz {
		disable-thermal-zone;
		cooling-maps {
			pm7325_gpu {
				trip = <&pm7325_trip0>;
@@ -227,7 +221,6 @@
	};

	pm8350c_tz {
		disable-thermal-zone;
		cooling-maps {
			pm8350c_gpu {
				trip = <&pm8350c_trip0>;
@@ -250,7 +243,6 @@
	};

	pmr735a_tz {
		disable-thermal-zone;
		cooling-maps {
			pmr735a_pa {
				trip = <&pmr735a_trip0>;
+0 −8
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@

&thermal_zones {
	socd {
		disable-thermal-zone;
		cooling-maps {
			socd_cpu4 {
				trip = <&socd_trip>;
@@ -35,7 +34,6 @@
	};

	pm7325b-bcl-lvl0 {
		disable-thermal-zone;
		cooling-maps {
			vbat_cpu4 {
				trip = <&b_bcl_lvl0>;
@@ -60,7 +58,6 @@
	};

	pm7325b-bcl-lvl1 {
		disable-thermal-zone;
		cooling-maps {
			vbat_cpu6 {
				trip = <&b_bcl_lvl1>;
@@ -85,7 +82,6 @@
	};

	pm7325b-bcl-lvl2 {
		disable-thermal-zone;
		cooling-maps {
			vbat_gpu2 {
				trip = <&b_bcl_lvl2>;
@@ -169,7 +165,6 @@
	};

	pm7325b_tz {
		disable-thermal-zone;
		cooling-maps {
			battery_cdev {
				trip = <&pm7325b_trip0>;
@@ -181,7 +176,6 @@
	};

	pm7325_tz {
		disable-thermal-zone;
		cooling-maps {
			pm7325_gpu {
				trip = <&pm7325_trip0>;
@@ -227,7 +221,6 @@
	};

	pm8350c_tz {
		disable-thermal-zone;
		cooling-maps {
			pm8350c_gpu {
				trip = <&pm8350c_trip0>;
@@ -250,7 +243,6 @@
	};

	pmr735a_tz {
		disable-thermal-zone;
		cooling-maps {
			pmr735a_pa {
				trip = <&pmr735a_trip0>;