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

Commit 84360e1a authored by Patrick Daly's avatar Patrick Daly
Browse files

ARM: dts: msm: Bulk iommu property rename for kona 



The dma-ranges property is no longer supported as of
commit ae7fbdcb
("arm64: dma-mapping: Fix arm_iommu_get_dma_window").

Change-Id: I43137a5c153c3455392634d55298053110aeefe6
Signed-off-by: default avatarPatrick Daly <pdaly@codeaurora.org>
parent bff4f4b8

arch/arm64/boot/dts/qcom/kona-camera.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ 
				<&apps_smmu 0xC40 0x400>,

				<&apps_smmu 0xC41 0x400>;

			qcom,iommu-faults = "non-fatal";

			dma-ranges = <0x7400000 0x7400000 0xd8c00000>;

			qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;

			label = "ife";

			ife_iova_mem_map: iova-mem-map {

				/* IO region is approximately 3.4 GB */
@@ -393,7 +393,7 @@ 
				<&apps_smmu 0x2440 0x400>;

			label = "jpeg";

			qcom,iommu-faults = "non-fatal";

			dma-ranges = <0x7400000 0x7400000 0xd8c00000>;

			qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;

			jpeg_iova_mem_map: iova-mem-map {

				/* IO region is approximately 3.4 GB */

				iova-mem-region-io {
@@ -430,7 +430,7 @@ 
				<&apps_smmu 0x2421 0x400>;

			label = "icp";

			qcom,iommu-faults = "non-fatal";

			dma-ranges = <0xda00000 0xda00000 0xace00000>;

			qcom,iommu-dma-addr-pool = <0xda00000 0xace00000>;

			icp_iova_mem_map: iova-mem-map {

				iova-mem-region-firmware {

					/* Firmware region is 5MB */
@@ -486,7 +486,7 @@ 
				<&apps_smmu 0x24C0 0x400>;

			label = "cpas-cdm0";

			qcom,iommu-faults = "non-fatal";

			dma-ranges = <0x7400000 0x7400000 0xd8c00000>;

			qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;

			cpas_cdm_iova_mem_map: iova-mem-map {

				iova-mem-region-io {

					/* IO region is approximately 3.4 GB */
@@ -510,7 +510,7 @@ 
			iommus = <&apps_smmu 0x2080 0x400>,

				<&apps_smmu 0x2480 0x400>;

			qcom,iommu-faults = "non-fatal";

			dma-ranges = <0x7400000 0x7400000 0xd8c00000>;

			qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;

			label = "fd";

			fd_iova_mem_map: iova-mem-map {

				iova-mem-region-io {

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

+15 −15
Original line number Diff line number Diff line
@@ -2535,7 +2535,7 @@ 
			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "cdsprpc-smd";

			iommus = <&apps_smmu 0x1001 0x0460>;

			dma-ranges = <0x80000000 0x80000000 0x78000000>;

			qcom,iommu-dma-addr-pool = <0x80000000 0x78000000>;

			qcom,iommu-faults = "stall-disable";

			dma-coherent;

		};
@@ -2544,7 +2544,7 @@ 
			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "cdsprpc-smd";

			iommus = <&apps_smmu 0x1002 0x0460>;

			dma-ranges = <0x80000000 0x80000000 0x78000000>;

			qcom,iommu-dma-addr-pool = <0x80000000 0x78000000>;

			qcom,iommu-faults = "stall-disable";

			dma-coherent;

		};
@@ -2553,7 +2553,7 @@ 
			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "cdsprpc-smd";

			iommus = <&apps_smmu 0x1003 0x0460>;

			dma-ranges = <0x80000000 0x80000000 0x78000000>;

			qcom,iommu-dma-addr-pool = <0x80000000 0x78000000>;

			qcom,iommu-faults = "stall-disable";

			dma-coherent;

		};
@@ -2562,7 +2562,7 @@ 
			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "cdsprpc-smd";

			iommus = <&apps_smmu 0x1004 0x0460>;

			dma-ranges = <0x80000000 0x80000000 0x78000000>;

			qcom,iommu-dma-addr-pool = <0x80000000 0x78000000>;

			qcom,iommu-faults = "stall-disable";

			dma-coherent;

		};
@@ -2571,7 +2571,7 @@ 
			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "cdsprpc-smd";

			iommus = <&apps_smmu 0x1005 0x0460>;

			dma-ranges = <0x80000000 0x80000000 0x78000000>;

			qcom,iommu-dma-addr-pool = <0x80000000 0x78000000>;

			qcom,iommu-faults = "stall-disable";

			dma-coherent;

		};
@@ -2580,7 +2580,7 @@ 
			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "cdsprpc-smd";

			iommus = <&apps_smmu 0x1006 0x0460>;

			dma-ranges = <0x80000000 0x80000000 0x78000000>;

			qcom,iommu-dma-addr-pool = <0x80000000 0x78000000>;

			qcom,iommu-faults = "stall-disable";

			dma-coherent;

		};
@@ -2589,7 +2589,7 @@ 
			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "cdsprpc-smd";

			iommus = <&apps_smmu 0x1007 0x0460>;

			dma-ranges = <0x80000000 0x80000000 0x78000000>;

			qcom,iommu-dma-addr-pool = <0x80000000 0x78000000>;

			qcom,iommu-faults = "stall-disable";

			dma-coherent;

		};
@@ -2598,7 +2598,7 @@ 
			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "cdsprpc-smd";

			iommus = <&apps_smmu 0x1008 0x0460>;

			dma-ranges = <0x80000000 0x80000000 0x78000000>;

			qcom,iommu-dma-addr-pool = <0x80000000 0x78000000>;

			qcom,iommu-faults = "stall-disable";

			dma-coherent;

		};
@@ -2608,7 +2608,7 @@ 
			label = "cdsprpc-smd";

			qcom,secure-context-bank;

			iommus = <&apps_smmu 0x1009 0x0460>;

			dma-ranges = <0x60000000 0x60000000 0x78000000>;

			qcom,iommu-dma-addr-pool = <0x60000000 0x78000000>;

			qcom,iommu-faults = "stall-disable";

			qcom,iommu-vmid = <0xA>;	/* VMID_CP_PIXEL */

			dma-coherent;
@@ -2618,7 +2618,7 @@ 
			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "adsprpc-smd";

			iommus = <&apps_smmu 0x1803 0x0>;

			dma-ranges = <0x80000000 0x80000000 0x78000000>;

			qcom,iommu-dma-addr-pool = <0x80000000 0x78000000>;

			qcom,iommu-faults = "stall-disable";

			dma-coherent;

		};
@@ -2627,7 +2627,7 @@ 
			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "adsprpc-smd";

			iommus = <&apps_smmu 0x1804 0x0>;

			dma-ranges = <0x80000000 0x80000000 0x78000000>;

			qcom,iommu-dma-addr-pool = <0x80000000 0x78000000>;

			qcom,iommu-faults = "stall-disable";

			dma-coherent;

		};
@@ -2636,7 +2636,7 @@ 
			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "adsprpc-smd";

			iommus = <&apps_smmu 0x1805 0x0>;

			dma-ranges = <0x80000000 0x80000000 0x78000000>;

			qcom,iommu-dma-addr-pool = <0x80000000 0x78000000>;

			qcom,iommu-faults = "stall-disable";

			dma-coherent;

		};
@@ -2645,7 +2645,7 @@ 
			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "sdsprpc-smd";

			iommus = <&apps_smmu 0x0541 0x0>;

			dma-ranges = <0x80000000 0x80000000 0x78000000>;

			qcom,iommu-dma-addr-pool = <0x80000000 0x78000000>;

			qcom,iommu-faults = "stall-disable";

			dma-coherent;

		};
@@ -2654,7 +2654,7 @@ 
			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "sdsprpc-smd";

			iommus = <&apps_smmu 0x0542 0x0>;

			dma-ranges = <0x80000000 0x80000000 0x78000000>;

			qcom,iommu-dma-addr-pool = <0x80000000 0x78000000>;

			qcom,iommu-faults = "stall-disable";

			dma-coherent;

		};
@@ -2663,7 +2663,7 @@ 
			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "sdsprpc-smd";

			iommus = <&apps_smmu 0x0543 0x0>;

			dma-ranges = <0x80000000 0x80000000 0x78000000>;

			qcom,iommu-dma-addr-pool = <0x80000000 0x78000000>;

			qcom,iommu-faults = "stall-disable";

			shared-cb = <4>;

			dma-coherent;