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

Commit 307593ca 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 memory mapped timer support for 8939"

parents da8bdc57 68ba6408

arch/arm/boot/dts/qcom/msm8939-rumi.dts

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ 
	timer {

		clock-frequency = <5000000>;

	};



	timer@b120000 {

		clock-frequency = <5000000>;

	};

};



&blsp1_uart2 {

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

+59 −0
Original line number Diff line number Diff line
@@ -125,6 +125,65 @@ 
		clock-frequency = <19200000>;

	};



	timer@b120000 {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;

		compatible = "arm,armv7-timer-mem";

		reg = <0xb120000 0x1000>;

		clock-frequency = <19200000>;



		frame@b121000 {

			frame-number = <0>;

			interrupts = <0 8 0x4>,

				     <0 7 0x4>;

			reg = <0xb121000 0x1000>,

			      <0xb122000 0x1000>;

		};



		frame@b123000 {

			frame-number = <1>;

			interrupts = <0 9 0x4>;

			reg = <0xb123000 0x1000>;

			status = "disabled";

		};



		frame@b124000 {

			frame-number = <2>;

			interrupts = <0 10 0x4>;

			reg = <0xb124000 0x1000>;

			status = "disabled";

		};



		frame@b125000 {

			frame-number = <3>;

			interrupts = <0 11 0x4>;

			reg = <0xb125000 0x1000>;

			status = "disabled";

		};



		frame@b126000 {

			frame-number = <4>;

			interrupts = <0 12 0x4>;

			reg = <0xb126000 0x1000>;

			status = "disabled";

		};



		frame@b127000 {

			frame-number = <5>;

			interrupts = <0 13 0x4>;

			reg = <0xb127000 0x1000>;

			status = "disabled";

		};



		frame@b128000 {

			frame-number = <6>;

			interrupts = <0 14 0x4>;

			reg = <0xb128000 0x1000>;

			status = "disabled";

		};

	};



	qcom,sps {

		compatible = "qcom,msm_sps_4k";

		qcom,device-type = <3>;