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

Commit 7725a54a authored by Laxminath Kasam's avatar Laxminath Kasam
Browse files

ARM: dts: msm: avoid duplicate domain in 8937/titanium 



In 8937 and titanium, avoid duplicate domain of lpass_q6_smmu.
As audio driver uses new DMA APIs, no need to have entry
in domains device tree file. Parse required properties
from adsp_io context bank device node.

Change-Id: I7934a4b8edfa2f5a54a25aa12537c19ae1a034ca
Signed-off-by: default avatarLaxminath Kasam <lkasam@codeaurora.org>
parent ae315603

arch/arm/boot/dts/qcom/msm-arm-smmu-8937.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -172,6 +172,8 @@ 
			qcom,iommu-ctx-sids = <0x2001>;

			qcom,iommu-sid-mask = <0x3f0>;

			label = "adsp_io";

			qcom,virtual-addr-pool = <0x10000000 0x0fffffff>;

			#iommu-cells = <1>;

		};



		adsp_opendsp: qcom,iommu-ctx@1e30000 {

arch/arm/boot/dts/qcom/msm-arm-smmu-titanium.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -173,6 +173,8 @@ 
			qcom,iommu-ctx-sids = <0x2401>;

			qcom,iommu-sid-mask = <0x3f0>;

			label = "adsp_io";

			qcom,virtual-addr-pool = <0x10000000 0x0fffffff>;

			#iommu-cells = <1>;

		};



		adsp_opendsp: qcom,iommu-ctx@1e30000 {

arch/arm/boot/dts/qcom/msm-audio.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ 
		compatible = "qcom,msm-audio-ion";

		qcom,smmu-version = <1>;

		qcom,smmu-enabled;

		iommus = <&lpass_q6_smmu 1>;

		iommus = <&adsp_io 1>;

	};



	qcom,msm-adsp-loader {

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

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

	qcom,iommu-domains {

		compatible = "qcom,iommu-domains";

		lpass_q6_smmu: qcom,iommu-domain1 {

			label = "adsp_io";

			qcom,iommu-contexts = <&adsp_io>;

			qcom,virtual-addr-pool = <0x10000000 0x0fffffff>;

			#iommu-cells = <1>;

		};



		/*

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

		 *                           3532 MB to 3548 MB