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

Commit e1565866 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 mitigation profiles for MSM8952"

parents 8e3ca908 df0fec29

arch/arm/boot/dts/qcom/msm8939-cpu.dtsi

+9 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -51,6 +51,7 @@ 
			compatible = "arm,cortex-a53";

			reg = <0x100>;

			enable-method = "qcom,arm-cortex-acc";

			qcom,limits-info = <&mitigation_profile0>;

			qcom,acc = <&acc0>;

			next-level-cache = <&L2_1>;

			L2_1: l2-cache {
@@ -65,6 +66,7 @@ 
			compatible = "arm,cortex-a53";

			reg = <0x101>;

			enable-method = "qcom,arm-cortex-acc";

			qcom,limits-info = <&mitigation_profile1>;

			qcom,acc = <&acc1>;

			next-level-cache = <&L2_1>;

		};
@@ -74,6 +76,7 @@ 
			compatible = "arm,cortex-a53";

			reg = <0x102>;

			enable-method = "qcom,arm-cortex-acc";

			qcom,limits-info = <&mitigation_profile2>;

			qcom,acc = <&acc2>;

			next-level-cache = <&L2_1>;

		};
@@ -83,6 +86,7 @@ 
			compatible = "arm,cortex-a53";

			reg = <0x103>;

			enable-method = "qcom,arm-cortex-acc";

			qcom,limits-info = <&mitigation_profile3>;

			qcom,acc = <&acc3>;

			next-level-cache = <&L2_1>;

		};
@@ -92,6 +96,7 @@ 
			compatible = "arm,cortex-a53";

			reg = <0x0>;

			enable-method = "qcom,arm-cortex-acc";

			qcom,limits-info = <&mitigation_profile4>;

			qcom,acc = <&acc4>;

			next-level-cache = <&L2_0>;

			L2_0: l2-cache {
@@ -106,6 +111,7 @@ 
			compatible = "arm,cortex-a53";

			reg = <0x1>;

			enable-method = "qcom,arm-cortex-acc";

			qcom,limits-info = <&mitigation_profile4>;

			qcom,acc = <&acc5>;

			next-level-cache = <&L2_0>;

		};
@@ -115,6 +121,7 @@ 
			compatible = "arm,cortex-a53";

			reg = <0x2>;

			enable-method = "qcom,arm-cortex-acc";

			qcom,limits-info = <&mitigation_profile4>;

			qcom,acc = <&acc6>;

			next-level-cache = <&L2_0>;

		};
@@ -124,6 +131,7 @@ 
			compatible = "arm,cortex-a53";

			reg = <0x3>;

			enable-method = "qcom,arm-cortex-acc";

			qcom,limits-info = <&mitigation_profile4>;

			qcom,acc = <&acc7>;

			next-level-cache = <&L2_0>;

		};

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

+35 −5
Original line number Diff line number Diff line
@@ -478,31 +478,26 @@ 
		sensor_information5: qcom,sensor-information-5 {

			qcom,sensor-type = "tsens";

			qcom,sensor-name = "tsens_tz_sensor5";

			qcom,alias-name = "cpu0";

		};



		sensor_information6: qcom,sensor-information-6 {

			qcom,sensor-type = "tsens";

			qcom,sensor-name = "tsens_tz_sensor6";

			qcom,alias-name = "cpu1";

		};



		sensor_information7: qcom,sensor-information-7 {

			qcom,sensor-type = "tsens";

			qcom,sensor-name = "tsens_tz_sensor7";

			qcom,alias-name = "cpu2";

		};



		sensor_information8: qcom,sensor-information-8 {

			qcom,sensor-type = "tsens";

			qcom,sensor-name = "tsens_tz_sensor8";

			qcom,alias-name = "cpu3";

		};



		sensor_information9: qcom,sensor-information-9 {

			qcom,sensor-type = "tsens";

			qcom,sensor-name = "tsens_tz_sensor9";

			qcom,alias-name = "cpu4-5-6-7";

		};



		sensor_information10: qcom,sensor-information-10 {
@@ -543,6 +538,41 @@ 
		};

	};



	mitigation_profile0: qcom,limit_info-0 {

		qcom,temperature-sensor = <&sensor_information5>;

		qcom,boot-frequency-mitigate;

		qcom,hotplug-mitigation-enable;

		qcom,emergency-frequency-mitigate;

	};



	mitigation_profile1: qcom,limit_info-1 {

		qcom,temperature-sensor = <&sensor_information6>;

		qcom,boot-frequency-mitigate;

		qcom,hotplug-mitigation-enable;

		qcom,emergency-frequency-mitigate;

	};



	mitigation_profile2: qcom,limit_info-2 {

		qcom,temperature-sensor = <&sensor_information7>;

		qcom,boot-frequency-mitigate;

		qcom,hotplug-mitigation-enable;

		qcom,emergency-frequency-mitigate;

	};



	mitigation_profile3: qcom,limit_info-3 {

		qcom,temperature-sensor = <&sensor_information8>;

		qcom,boot-frequency-mitigate;

		qcom,hotplug-mitigation-enable;

		qcom,emergency-frequency-mitigate;

	};



	mitigation_profile4: qcom,limit_info-4 {

		qcom,temperature-sensor = <&sensor_information9>;

		qcom,boot-frequency-mitigate;

		qcom,hotplug-mitigation-enable;

		qcom,emergency-frequency-mitigate;

	};



	qcom,msm-thermal {

		compatible = "qcom,msm-thermal";

		qcom,sensor-id = <5>;