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

Commit 4226501b 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: Move PDC node for sdm845/sdm670"

parents 1a01d276 04f03216

arch/arm64/boot/dts/qcom/sdm670-pm.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -186,12 +186,4 @@ 
		reg = <0xc300000 0x1000>, <0xc3f0004 0x4>;

		reg-names = "phys_addr_base", "offset_addr";

	};



	pdc: interrupt-controller@b220000{

		compatible = "qcom,pdc-sdm670";

		reg = <0xb220000 0x400>;

		#interrupt-cells = <3>;

		interrupt-parent = <&intc>;

		interrupt-controller;

	};

};

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

+8 −0
Original line number Diff line number Diff line
@@ -701,6 +701,14 @@ 
		interrupt-parent = <&intc>;

	};



	pdc: interrupt-controller@b220000{

		compatible = "qcom,pdc-sdm670";

		reg = <0xb220000 0x400>;

		#interrupt-cells = <3>;

		interrupt-parent = <&intc>;

		interrupt-controller;

	};



	timer {

		compatible = "arm,armv8-timer";

		interrupts = <1 1 0xf08>,

arch/arm64/boot/dts/qcom/sdm845-pm.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -139,12 +139,4 @@ 
		reg = <0xC300000 0x1000>, <0xC3F0004 0x4>;

		reg-names = "phys_addr_base", "offset_addr";

	};



	pdc: interrupt-controller@0xb220000{

		compatible = "qcom,pdc-sdm845";

		reg = <0xb220000 0x400>;

		#interrupt-cells = <3>;

		interrupt-parent = <&intc>;

		interrupt-controller;

	};

};

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

+8 −0
Original line number Diff line number Diff line
@@ -762,6 +762,14 @@ 
		interrupt-parent = <&intc>;

	};



	pdc: interrupt-controller@b220000{

		compatible = "qcom,pdc-sdm845";

		reg = <0xb220000 0x400>;

		#interrupt-cells = <3>;

		interrupt-parent = <&intc>;

		interrupt-controller;

	};



	timer {

		compatible = "arm,armv8-timer";

		interrupts = <1 1 0xf08>,