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

Commit 8c716837 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: qcom: add avtimer device"

parents 199db36d f30a88bb

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

+7 −0
Original line number Diff line number Diff line
@@ -1709,6 +1709,13 @@ 
		reg = <0x400000 0x80000>;

		reg-names = "bimc";

	};



	qcom,avtimer {

		compatible = "qcom,avtimer";

		reg = <0x0770600C 0x4>,

			<0x07706010 0x4>;

		reg-names = "avtimer_lsb_addr", "avtimer_msb_addr";

	};

};



&gdsc_venus {

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

+7 −0
Original line number Diff line number Diff line
@@ -1468,6 +1468,13 @@ 
		qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_4_out 0 0>;

		linux,contiguous-region = <&peripheral_mem>;

	};



	qcom,avtimer {

		compatible = "qcom,avtimer";

		reg = <0xfe053008 0x4>,

			<0xfe05300c 0x4>;

		reg-names = "avtimer_lsb_addr", "avtimer_msb_addr";

	};

};



&gdsc_venus {