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

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

Merge "ARM: dts: msm: Add vbat and soc mitigation for SM8150" into msm-4.14

parents dccb37db fde9eeaa

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

+14 −10
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ 
	};



	pm855b-ibat-lvl0 {

		polling-delay-passive = <0>;

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm855b_bcl 0>;
@@ -528,14 +528,15 @@ 
	};



	pm855b-vbat-lvl0 {

		polling-delay-passive = <0>;

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&pm855b_bcl 2>;

		tracks-low;



		trips {

			vbat_lvl0: vbat-lvl0 {

				temperature = <3500>;

				temperature = <3000>;

				hysteresis = <200>;

				type = "passive";

			};
@@ -545,12 +546,13 @@ 
	pm855b-vbat-lvl1 {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&pm855b_bcl 3>;

		tracks-low;



		trips {

			vbat_lvl1:vbat-lvl1 {

				temperature = <3000>;

				temperature = <2800>;

				hysteresis = <200>;

				type = "passive";

			};
@@ -560,12 +562,13 @@ 
	pm855b-vbat-lvl2 {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&pm855b_bcl 4>;

		tracks-low;



		trips {

			vbat_lvl2:vbat-lvl2 {

				temperature = <2800>;

				temperature = <2600>;

				hysteresis = <200>;

				type = "passive";

			};
@@ -573,10 +576,11 @@ 
	};



	soc {

		polling-delay-passive = <0>;

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&bcl_soc>;

		tracks-low;



		trips {

			soc_trip:soc-trip {

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

+4 −4
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ 
	};



	pm855l-vph-lvl0 {

		polling-delay-passive = <0>;

		polling-delay-passive = <100>;

		polling-delay = <0>;

		thermal-governor = "low_limits_cap";

		thermal-sensors = <&pm855l_bcl 2>;
@@ -345,7 +345,7 @@ 


		trips {

			vph_lvl0: vph-lvl0 {

				temperature = <3500>;

				temperature = <3000>;

				hysteresis = <200>;

				type = "passive";

			};
@@ -361,7 +361,7 @@ 


		trips {

			vph_lvl1:vph-lvl1 {

				temperature = <3000>;

				temperature = <2750>;

				hysteresis = <200>;

				type = "passive";

			};
@@ -377,7 +377,7 @@ 


		trips {

			vph_lvl2:vph-lvl2 {

				temperature = <2800>;

				temperature = <2500>;

				hysteresis = <200>;

				type = "passive";

			};

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

+1 −119
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ 


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

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

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



#include "sm8150-pmic-overlay.dtsi"

#include "sm8150-audio-overlay.dtsi"

#include "sm8150-sde-display.dtsi"

#include "sm8150-camera-sensor-cdp.dtsi"

#include "sm8150-thermal-overlay.dtsi"



&qupv3_se12_2uart {

	status = "ok";
@@ -88,10 +88,6 @@ 
	};

};



&mdss_mdp {

	#cooling-cells = <2>;

};



&dsi_sharp_4k_dsc_cmd {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";
@@ -382,120 +378,6 @@ 
	};

};



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

			};

		};

	};

};



&wil6210 {

	status = "ok";

};

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

+1 −119
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ 


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

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

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



#include "sm8150-pmic-overlay.dtsi"

#include "sm8150-audio-overlay.dtsi"

#include "sm8150-sde-display.dtsi"

#include "sm8150-camera-sensor-mtp.dtsi"

#include "sm8150-thermal-overlay.dtsi"



&qupv3_se12_2uart {

	status = "ok";
@@ -205,10 +205,6 @@ 
	};

};



&mdss_mdp {

	#cooling-cells = <2>;

};



&ufsphy_mem {

	compatible = "qcom,ufs-phy-qmp-v4";
@@ -386,120 +382,6 @@ 
	};

};



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

			};

		};

	};

};



&wil6210 {

	status = "ok";

};

arch/arm64/boot/dts/qcom/sm8150-qrd.dtsi

+1 −119
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ 


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

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

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



#include "sm8150-pmic-overlay.dtsi"

#include "sm8150-audio-overlay.dtsi"

#include "sm8150-sde-display.dtsi"

#include "sm8150-camera-sensor-qrd.dtsi"

#include "sm8150-thermal-overlay.dtsi"



&vendor {

	bluetooth: bt_wcn3990 {
@@ -67,10 +67,6 @@ 
	};

};



&mdss_mdp {

	#cooling-cells = <2>;

};



&qupv3_se17_i2c {

	status = "ok";
@@ -389,120 +385,6 @@ 
	};

};



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

			};

		};

	};

};



&wil6210 {

	status = "ok";

};