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

Commit 566d1d5d 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: Remove IOMMU domain adsp_shared_domain for msmtitanium"

parents 37c2494f 52df155c

arch/arm/boot/dts/qcom/msmtitanium-iommu-domains.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -13,14 +13,6 @@ 
&soc {

	qcom,iommu-domains {

		compatible = "qcom,iommu-domains";

		/*

		 * non-secure addr pool from 2048MB to 4096MB

		*/

		adsp_shared_domain: qcom,iommu-domain6 {

			label = "adsp_shared";

			qcom,iommu-contexts = <&adsp_shared>;

			qcom,virtual-addr-pool = <0x80000000 0x7FFFFFFF>;

		};



		/*

		 * non-secure addr pool from 1500 MB to 3532 MB

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

+2 −1
Original line number Diff line number Diff line
@@ -1243,9 +1243,10 @@ 
	qcom,adsprpc_domains {

		compatible = "qcom,msm-fastrpc-legacy-compute-cb";

		qcom,msm_fastrpc_compute_cb {

			qcom,adsp-shared-domain-phandle = <&adsp_shared_domain>;

			qcom,adsp-shared-phandle = <&adsp_shared>;

			qcom,adsp-shared-sids =

					<0x8 0x9 0xa 0xb 0xc 0xd 0xe 0xf>;

			qcom,virtual-addr-pool = <0x80000000 0x7FFFFFFF>;

		};

	};