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

Commit ddaa69c1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I3631dd9f,Ie5f2b6d4,Icf25109a into msm-4.14 

* changes:
  ARM: dts: msm: Add regulator cooling device for SDM855
  ARM: dts: msm: Add die temperature zone config for PM855 and PM855b
  ARM: dts: msm: Add BCL sensors for pm855l
parents 6fa6fb27 730ec0f4

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

+3 −3
Original line number Diff line number Diff line
@@ -152,12 +152,12 @@ 
		thermal-sensors = <&pm855_tz>;



		trips {

			trip0 {

			pm855_trip0: trip0 {

				temperature = <95000>;

				hysteresis = <0>;

				type = "passive";

			};

			trip1 {

			pm855_trip1: trip1 {

				temperature = <115000>;

				hysteresis = <0>;

				type = "passive";
@@ -165,7 +165,7 @@ 
			trip2 {

				temperature = <145000>;

				hysteresis = <0>;

				type = "critical";

				type = "passive";

			};

		};

	};

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

+4 −3
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ 
			compatible = "qcom,qpnp-smb5";

			#address-cells = <1>;

			#size-cells = <1>;

			#cooling-cells = <2>;



			qcom,pmic-revid = <&pm855b_revid>;
@@ -463,12 +464,12 @@ 
		thermal-sensors = <&pm855b_tz>;



		trips {

			trip0 {

			pm855b_trip0: trip0 {

				temperature = <95000>;

				hysteresis = <0>;

				type = "passive";

			};

			trip1 {

			pm855b_trip1: trip1 {

				temperature = <115000>;

				hysteresis = <0>;

				type = "passive";
@@ -476,7 +477,7 @@ 
			trip2 {

				temperature = <145000>;

				hysteresis = <0>;

				type = "critical";

				type = "passive";

			};

		};

	};

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

+61 −1
Original line number Diff line number Diff line
@@ -105,6 +105,18 @@ 
				qcom,pre-scaling = <1 1>;

			};

		};



		pm855l_bcl: bcl@3d00 {

			compatible = "qcom,bcl-v5";

			reg = <0x3d00 0x100>;

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

			#thermal-sensor-cells = <1>;

		};

	};



	qcom,pm855l@5 {
@@ -318,7 +330,55 @@ 
			trip2 {

				temperature = <145000>;

				hysteresis = <0>;

				type = "critical";

				type = "passive";

			};

		};

	};



	pm855l-vph-lvl0 {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&pm855l_bcl 2>;

		tracks-low;



		trips {

			vph_lvl0: vph-lvl0 {

				temperature = <3500>;

				hysteresis = <200>;

				type = "passive";

			};

		};

	};



	pm855l-vph-lvl1 {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&pm855l_bcl 3>;

		tracks-low;



		trips {

			vph_lvl1:vph-lvl1 {

				temperature = <3000>;

				hysteresis = <200>;

				type = "passive";

			};

		};

	};



	pm855l-vph-lvl2 {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&pm855l_bcl 4>;

		tracks-low;



		trips {

			vph_lvl2:vph-lvl2 {

				temperature = <2800>;

				hysteresis = <200>;

				type = "passive";

			};

		};

	};

arch/arm64/boot/dts/qcom/sdm855-cdp.dtsi

+115 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


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

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

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



#include "sdm855-pmic-overlay.dtsi"

#include "sdm855-audio-overlay.dtsi"
@@ -358,3 +359,117 @@ 
		qcom,pre-scaling = <1 1>;

	};

};



&thermal_zones {

	pm855b_tz {

		cooling-maps {

			trip0_bat {

				trip = <&pm855b_trip0>;

				cooling-device =

					<&pm855b_charger (THERMAL_MAX_LIMIT-1)

						(THERMAL_MAX_LIMIT-1)>;

			};

			trip1_bat {

				trip = <&pm855b_trip1>;

				cooling-device =

					<&pm855b_charger THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};

	};



	pm855_tz {

		cooling-maps {

			trip0_cpu0 {

				trip = <&pm855_trip0>;

				cooling-device =

					<&CPU0 (THERMAL_MAX_LIMIT-1)

						(THERMAL_MAX_LIMIT-1)>;

			};

			trip0_cpu1 {

				trip = <&pm855_trip0>;

				cooling-device =

					<&CPU1 (THERMAL_MAX_LIMIT-1)

						(THERMAL_MAX_LIMIT-1)>;

			};

			trip0_cpu2 {

				trip = <&pm855_trip0>;

				cooling-device =

					<&CPU2 (THERMAL_MAX_LIMIT-1)

						(THERMAL_MAX_LIMIT-1)>;

			};

			trip0_cpu3 {

				trip = <&pm855_trip0>;

				cooling-device =

					<&CPU3 (THERMAL_MAX_LIMIT-1)

						(THERMAL_MAX_LIMIT-1)>;

			};

			trip0_cpu4 {

				trip = <&pm855_trip0>;

				cooling-device =

					<&CPU4 (THERMAL_MAX_LIMIT-1)

						(THERMAL_MAX_LIMIT-1)>;

			};

			trip0_cpu5 {

				trip = <&pm855_trip0>;

				cooling-device =

					<&CPU5 (THERMAL_MAX_LIMIT-1)

						(THERMAL_MAX_LIMIT-1)>;

			};

			trip0_cpu6 {

				trip = <&pm855_trip0>;

				cooling-device =

					<&CPU6 (THERMAL_MAX_LIMIT-1)

						(THERMAL_MAX_LIMIT-1)>;

			};

			trip0_cpu7 {

				trip = <&pm855_trip0>;

				cooling-device =

					<&CPU7 (THERMAL_MAX_LIMIT-1)

						(THERMAL_MAX_LIMIT-1)>;

			};

			trip1_cpu1 {

				trip = <&pm855_trip1>;

				cooling-device =

					<&CPU1 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			trip1_cpu2 {

				trip = <&pm855_trip1>;

				cooling-device =

					<&CPU2 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			trip1_cpu3 {

				trip = <&pm855_trip1>;

				cooling-device =

					<&CPU3 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			trip1_cpu4 {

				trip = <&pm855_trip1>;

				cooling-device =

					<&CPU4 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			trip1_cpu5 {

				trip = <&pm855_trip1>;

				cooling-device =

					<&CPU5 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			trip1_cpu6 {

				trip = <&pm855_trip1>;

				cooling-device =

					<&CPU6 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			trip1_cpu7 {

				trip = <&pm855_trip1>;

				cooling-device =

					<&CPU7 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};

	};

};

arch/arm64/boot/dts/qcom/sdm855-mtp.dtsi

+115 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


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

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

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



#include "sdm855-pmic-overlay.dtsi"

#include "sdm855-audio-overlay.dtsi"
@@ -362,3 +363,117 @@ 
		qcom,pre-scaling = <1 1>;

	};

};



&thermal_zones {

	pm855b_tz {

		cooling-maps {

			trip0_bat {

				trip = <&pm855b_trip0>;

				cooling-device =

					<&pm855b_charger (THERMAL_MAX_LIMIT-1)

						(THERMAL_MAX_LIMIT-1)>;

			};

			trip1_bat {

				trip = <&pm855b_trip1>;

				cooling-device =

					<&pm855b_charger THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};

	};



	pm855_tz {

		cooling-maps {

			trip0_cpu0 {

				trip = <&pm855_trip0>;

				cooling-device =

					<&CPU0 (THERMAL_MAX_LIMIT-1)

						(THERMAL_MAX_LIMIT-1)>;

			};

			trip0_cpu1 {

				trip = <&pm855_trip0>;

				cooling-device =

					<&CPU1 (THERMAL_MAX_LIMIT-1)

						(THERMAL_MAX_LIMIT-1)>;

			};

			trip0_cpu2 {

				trip = <&pm855_trip0>;

				cooling-device =

					<&CPU2 (THERMAL_MAX_LIMIT-1)

						(THERMAL_MAX_LIMIT-1)>;

			};

			trip0_cpu3 {

				trip = <&pm855_trip0>;

				cooling-device =

					<&CPU3 (THERMAL_MAX_LIMIT-1)

						(THERMAL_MAX_LIMIT-1)>;

			};

			trip0_cpu4 {

				trip = <&pm855_trip0>;

				cooling-device =

					<&CPU4 (THERMAL_MAX_LIMIT-1)

						(THERMAL_MAX_LIMIT-1)>;

			};

			trip0_cpu5 {

				trip = <&pm855_trip0>;

				cooling-device =

					<&CPU5 (THERMAL_MAX_LIMIT-1)

						(THERMAL_MAX_LIMIT-1)>;

			};

			trip0_cpu6 {

				trip = <&pm855_trip0>;

				cooling-device =

					<&CPU6 (THERMAL_MAX_LIMIT-1)

						(THERMAL_MAX_LIMIT-1)>;

			};

			trip0_cpu7 {

				trip = <&pm855_trip0>;

				cooling-device =

					<&CPU7 (THERMAL_MAX_LIMIT-1)

						(THERMAL_MAX_LIMIT-1)>;

			};

			trip1_cpu1 {

				trip = <&pm855_trip1>;

				cooling-device =

					<&CPU1 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			trip1_cpu2 {

				trip = <&pm855_trip1>;

				cooling-device =

					<&CPU2 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			trip1_cpu3 {

				trip = <&pm855_trip1>;

				cooling-device =

					<&CPU3 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			trip1_cpu4 {

				trip = <&pm855_trip1>;

				cooling-device =

					<&CPU4 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			trip1_cpu5 {

				trip = <&pm855_trip1>;

				cooling-device =

					<&CPU5 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			trip1_cpu6 {

				trip = <&pm855_trip1>;

				cooling-device =

					<&CPU6 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			trip1_cpu7 {

				trip = <&pm855_trip1>;

				cooling-device =

					<&CPU7 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};

	};

};