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

Commit b3e24b68 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: Update correct tsens map and alias for msm8909"

parents 38418cf1 10d2ef4d

arch/arm/boot/dts/qcom/msm8909.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -350,29 +350,29 @@ 
		sensor_information0: qcom,sensor-information@0 {

			qcom,sensor-type = "tsens";

			qcom,sensor-name = "tsens_tz_sensor0";

			qcom,alias-name = "pop_mem";

		};



		sensor_information1: qcom,sensor-information@1 {

			qcom,sensor-type =  "tsens";

			qcom,sensor-name = "tsens_tz_sensor1";

			qcom,alias-name = "cpu0-2";

		};



		sensor_information2: qcom,sensor-information@2 {

			qcom,sensor-type =  "tsens";

			qcom,sensor-name = "tsens_tz_sensor2";

			qcom,alias-name = "cpu1-3";

		};



		sensor_information3: qcom,sensor-information@3 {

			qcom,sensor-type =  "tsens";

			qcom,sensor-name = "tsens_tz_sensor3";

			qcom,alias-name = "pop_mem";

			qcom,alias-name = "cpu0-2";

		};



		sensor_information4: qcom,sensor-information@4 {

			qcom,sensor-type = "tsens";

			qcom,sensor-name = "tsens_tz_sensor4";

			qcom,alias-name = "cpu1-3";

		};



		sensor_information5: qcom,sensor-information@5 {
@@ -383,7 +383,7 @@ 


	qcom,msm-thermal {

		compatible = "qcom,msm-thermal";

		qcom,sensor-id = <1>;

		qcom,sensor-id = <3>;

		qcom,poll-ms = <250>;

		qcom,limit-temp = <60>;

		qcom,temp-hysteresis = <10>;
@@ -394,8 +394,8 @@ 
		qcom,core-control-mask = <0xe>;

		qcom,hotplug-temp = <110>;

		qcom,hotplug-temp-hysteresis = <20>;

		qcom,cpu-sensors = "tsens_tz_sensor1", "tsens_tz_sensor2",

				"tsens_tz_sensor1", "tsens_tz_sensor2";

		qcom,cpu-sensors = "tsens_tz_sensor3", "tsens_tz_sensor4",

				"tsens_tz_sensor3", "tsens_tz_sensor4";

		qcom,freq-mitigation-temp = <110>;

		qcom,freq-mitigation-temp-hysteresis = <20>;

		qcom,freq-mitigation-value = <400000>;