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

Commit 23ed922d authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Remove s1 bypass for atoll"

parents 46d41cd4 296af98c
Loading
Loading
Loading
Loading
+2 −3
Original line number Original line Diff line number Diff line
@@ -2250,9 +2250,8 @@
			<0x6064000 0x15000>;
			<0x6064000 0x15000>;
		reg-names = "tmc-base", "bam-base";
		reg-names = "tmc-base", "bam-base";


		qcom,smmu-s1-bypass;
		iommus = <&apps_smmu 0x04a0 0x20>,
		iommus = <&apps_smmu 0x04a0 0>,
				<&apps_smmu 0x0480 0x20>;
				<&apps_smmu 0x0480 0>;


		coresight-ctis = <&cti0 &cti0>;
		coresight-ctis = <&cti0 &cti0>;
		coresight-csr = <&csr>;
		coresight-csr = <&csr>;