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

Commit d6671cc6 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: Enable msm boot stats"

parents 64c356eb c0aeb0ab

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

+19 −0
Original line number Diff line number Diff line
@@ -176,6 +176,19 @@ 
		};

	};



	restart@4ab000 {

		compatible = "qcom,pshold";

		reg = <0x4ab000 0x4>,

			<0x193d100 0x4>;

		reg-names = "pshold-base", "tcsr-boot-misc-detect";

	};



	qcom,mpm2-sleep-counter@4a3000 {

		compatible = "qcom,mpm2-sleep-counter";

		reg = <0x4a3000 0x1000>;

		clock-frequency = <32768>;

	};



	qcom,sps {

		compatible = "qcom,msm_sps_4k";

		qcom,pipe-attr-ee;
@@ -449,6 +462,7 @@ 
		qcom,bark-time = <11000>;

		qcom,pet-time = <10000>;

		qcom,ipi-ping;

		qcom,wakeup-enable;

		status = "disabled";

	};
@@ -473,6 +487,11 @@ 
			compatible = "qcom,msm-imem-restart_reason";

			reg = <0x65c 4>;

		};



		boot_stats@6b0 {

			compatible = "qcom,msm-imem-boot_stats";

			reg = <0x6b0 32>;

		};

	};



	jtag_fuse: jtagfuse@a601c {

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

+19 −0
Original line number Diff line number Diff line
@@ -176,6 +176,19 @@ 
		};

	};



	restart@4ab000 {

		compatible = "qcom,pshold";

		reg = <0x4ab000 0x4>,

			<0x193d100 0x4>;

		reg-names = "pshold-base", "tcsr-boot-misc-detect";

	};



	qcom,mpm2-sleep-counter@4a3000 {

		compatible = "qcom,mpm2-sleep-counter";

		reg = <0x4a3000 0x1000>;

		clock-frequency = <32768>;

	};



	qcom,sps {

		compatible = "qcom,msm_sps_4k";

		qcom,pipe-attr-ee;
@@ -295,6 +308,7 @@ 
		qcom,bark-time = <11000>;

		qcom,pet-time = <10000>;

		qcom,ipi-ping;

		qcom,wakeup-enable;

		status = "disabled";

	};
@@ -314,6 +328,11 @@ 
			compatible = "qcom,msm-imem-restart_reason";

			reg = <0x65c 4>;

		};



		boot_stats@6b0 {

			compatible = "qcom,msm-imem-boot_stats";

			reg = <0x6b0 32>;

		};

	};



	qcom,smdtty {