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

Commit 8656a394 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Update the interrupt numbers for qtimer" into msm-4.8

parents 2250e324 925d5423

arch/arm64/boot/dts/qcom/msmskunk.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -409,50 +409,50 @@ 


		frame@0x17CA0000 {

			frame-number = <0>;

			interrupts = <0 8 0x4>,

				     <0 7 0x4>;

			interrupts = <0 7 0x4>,

				     <0 6 0x4>;

			reg = <0x17CA0000 0x1000>,

			      <0x17CB0000 0x1000>;

		};



		frame@17cc0000 {

			frame-number = <1>;

			interrupts = <0 9 0x4>;

			interrupts = <0 8 0x4>;

			reg = <0x17cc0000 0x1000>;

			status = "disabled";

		};



		frame@17cd0000 {

			frame-number = <2>;

			interrupts = <0 10 0x4>;

			interrupts = <0 9 0x4>;

			reg = <0x17cd0000 0x1000>;

			status = "disabled";

		};



		frame@17ce0000 {

			frame-number = <3>;

			interrupts = <0 11 0x4>;

			interrupts = <0 10 0x4>;

			reg = <0x17ce0000 0x1000>;

			status = "disabled";

		};



		frame@17cf0000 {

			frame-number = <4>;

			interrupts = <0 12 0x4>;

			interrupts = <0 11 0x4>;

			reg = <0x17cf0000 0x1000>;

			status = "disabled";

		};



		frame@17d00000 {

			frame-number = <5>;

			interrupts = <0 36 0x4>;

			interrupts = <0 12 0x4>;

			reg = <0x17d00000 0x1000>;

			status = "disabled";

		};



		frame@17d10000 {

			frame-number = <6>;

			interrupts = <0 37 0x4>;

			interrupts = <0 13 0x4>;

			reg = <0x17d10000 0x1000>;

			status = "disabled";

		};