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

Commit 3548211e 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 timer register base for sdm855" into msm-next

parents 55c935b0 85b9ca90
Loading
Loading
Loading
Loading
+25 −25
Original line number Diff line number Diff line
@@ -363,61 +363,61 @@
		clock-frequency = <19200000>;
	};

	timer@0x17c00000{
	timer@0x17c20000{
		#address-cells = <1>;
		#size-cells = <1>;
		ranges;
		compatible = "arm,armv7-timer-mem";
		reg = <0x17c00000 0x1000>;
		reg = <0x17c20000 0x1000>;
		clock-frequency = <19200000>;

		frame@0x17c10000 {
		frame@0x17c21000 {
			frame-number = <0>;
			interrupts = <0 20 0x4>,
				     <0 19 0x4>;
			reg = <0x17c10000 0x1000>,
			      <0x17c20000 0x1000>;
			interrupts = <0 7 0x4>,
				     <0 6 0x4>;
			reg = <0x17c21000 0x1000>,
			      <0x17c22000 0x1000>;
		};

		frame@17c30000 {
		frame@17c23000 {
			frame-number = <1>;
			interrupts = <0 21 0x4>;
			reg = <0x17c30000 0x1000>;
			interrupts = <0 8 0x4>;
			reg = <0x17c23000 0x1000>;
			status = "disabled";
		};

		frame@17c40000 {
		frame@17c25000 {
			frame-number = <2>;
			interrupts = <0 22 0x4>;
			reg = <0x17c40000 0x1000>;
			interrupts = <0 9 0x4>;
			reg = <0x17c25000 0x1000>;
			status = "disabled";
		};

		frame@17c60000 {
		frame@17c27000 {
			frame-number = <3>;
			interrupts = <0 23 0x4>;
			reg = <0x17c60000 0x1000>;
			interrupts = <0 10 0x4>;
			reg = <0x17c26000 0x1000>;
			status = "disabled";
		};

		frame@17c70000 {
		frame@17c29000 {
			frame-number = <4>;
			interrupts = <0 24 0x4>;
			reg = <0x17c70000 0x1000>;
			interrupts = <0 11 0x4>;
			reg = <0x17c29000 0x1000>;
			status = "disabled";
		};

		frame@17c800000 {
		frame@17c2b000 {
			frame-number = <5>;
			interrupts = <0 25 0x4>;
			reg = <0x17c80000 0x1000>;
			interrupts = <0 12 0x4>;
			reg = <0x17c2b000 0x1000>;
			status = "disabled";
		};

		frame@17c90000 {
		frame@17c2d000 {
			frame-number = <6>;
			interrupts = <0 26 0x4>;
			reg = <0x17c90000 0x1000>;
			interrupts = <0 13 0x4>;
			reg = <0x17c2d000 0x1000>;
			status = "disabled";
		};
	};