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

Commit 3f0f8dcb 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: Disable SMMU S1 from IPA side in sdxpoorwills"

parents be09d95e 8870b4f7

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

+0 −26
Original line number Diff line number Diff line
@@ -742,8 +742,6 @@ 
		qcom,mhi-event-ring-id-limits = <9 10>; /* start and end */

		qcom,modem-cfg-emb-pipe-flt;

		qcom,use-ipa-pm;

		qcom,arm-smmu;

		qcom,smmu-fast-map;

		qcom,bandwidth-vote-for-ipa;

		qcom,msm-bus,name = "ipa";

		qcom,msm-bus,num-cases = <5>;
@@ -882,30 +880,6 @@ 
			compatible = "qcom,smp2pgpio-map-ipa-1-in";

			gpios = <&smp2pgpio_ipa_1_in 0 0>;

		};



		ipa_smmu_ap: ipa_smmu_ap {

			compatible = "qcom,ipa-smmu-ap-cb";

			iommus = <&apps_smmu 0x5E0 0x0>;

			qcom,iova-mapping = <0x20000000 0x40000000>;

			qcom,additional-mapping =

			/* modem tables in IMEM */

			<0x14686000 0x14686000 0x3000>;

			qcom,ipa-q6-smem-size = <16384>;

		};



		ipa_smmu_wlan: ipa_smmu_wlan {

			compatible = "qcom,ipa-smmu-wlan-cb";

			iommus = <&apps_smmu 0x5E1 0x0>;

			qcom,additional-mapping =

			/* ipa-uc ram */

			<0x1E60000 0x1E60000 0xA000>;

		};



		ipa_smmu_uc: ipa_smmu_uc {

			compatible = "qcom,ipa-smmu-uc-cb";

			iommus = <&apps_smmu 0x5E2 0x0>;

			qcom,iova-mapping = <0x40000000 0x20000000>;

		};

	};



	qmp_aop: qcom,qmp-aop@c300000 {