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

Commit 088d71ca 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: enable IPA SMMU S1 for msmnile" into msm-4.14

parents 84c0fdbc 3cfce8b8
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -3093,12 +3093,12 @@

	ipa_smmu_ap: ipa_smmu_ap {
		compatible = "qcom,ipa-smmu-ap-cb";
		qcom,smmu-s1-bypass;
		iommus = <&apps_smmu 0x520 0x0>;
		qcom,iova-mapping = <0x20000000 0x40000000>;
		qcom,additional-mapping =
		/* modem tables in IMEM */
		<0x146BD000 0x146BD000 0x2000>;
		dma-coherent;
	};

	ipa_smmu_wlan: ipa_smmu_wlan {