Merge "ARM: dts: msm: Enable SMMU S1 from IPA and WLAN side in SDM845" (7fff8cfd) · Commits · e / devices / android_kernel_fairphone_FP3

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -2648,6 +2648,7 @@
		qcom,ipa-wdi2;
		qcom,use-64-bit-dma-mask;
		qcom,arm-smmu;
		qcom,smmu-fast-map;
		qcom,bandwidth-vote-for-ipa;
		qcom,msm-bus,name = "ipa";
		qcom,msm-bus,num-cases = <5>;
		@@ -2770,7 +2771,6 @@

		ipa_smmu_ap: ipa_smmu_ap {
		compatible = "qcom,ipa-smmu-ap-cb";
		qcom,smmu-s1-bypass;
		iommus = <&apps_smmu 0x720 0x0>;
		qcom,iova-mapping = <0x20000000 0x40000000>;
		qcom,additional-mapping =
		@@ -2780,7 +2780,6 @@

		ipa_smmu_wlan: ipa_smmu_wlan {
		compatible = "qcom,ipa-smmu-wlan-cb";
		qcom,smmu-s1-bypass;
		iommus = <&apps_smmu 0x721 0x0>;
		qcom,additional-mapping =
		/* ipa-uc ram */
		@@ -2789,7 +2788,6 @@

		ipa_smmu_uc: ipa_smmu_uc {
		compatible = "qcom,ipa-smmu-uc-cb";
		qcom,smmu-s1-bypass;
		iommus = <&apps_smmu 0x722 0x0>;
		qcom,iova-mapping = <0x40000000 0x20000000>;
		};
		@@ -3089,7 +3087,6 @@
		vdd-3.3-ch0-supply = <&pm8998_l25>;
		qcom,vdd-0.8-cx-mx-config = <800000 800000>;
		qcom,vdd-3.3-ch0-config = <3104000 3312000>;
		qcom,smmu-s1-bypass;
		};

		qmi-tmd-devices {