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

Commit cc6d8e51 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: avoid duplicate domain in msmgold"

parents c5a235bd 60d906fd

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

+1 −3
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -172,8 +172,6 @@ 
			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

+1 −3
Original line number Diff line number Diff line 
/*

 *Copyright (c) 2015, The Linux Foundation. All rights reserved.

 *Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -173,8 +173,6 @@ 
			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

+5 −0
Original line number Diff line number Diff line
@@ -626,6 +626,11 @@ 
	};

};



&adsp_io {

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

	#iommu-cells = <1>;

};



&slim_msm {

	status = "disabled";

	dai_slim: msm_dai_slim {

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

+1 −8
Original line number Diff line number Diff line 
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -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