Merge "ARM: dts: msm: Bulk rename of iommu dt properties for kona" (9b46d8c4) · Commits · e / devices / android_kernel_fairphone_FP4

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-vidc.dtsi

+4 −4

Original line number	Diff line number	Diff line
		@@ -77,7 +77,7 @@
		iommus = <&apps_smmu 0x2100 0x0400>;
		qcom,iommu-dma-addr-pool = <0x25800000 0xba800000>;
		qcom,iommu-faults = "non-fatal";
		qcom,iommu-pagetables = "LLC";
		qcom,iommu-pagetable = "LLC";
		buffer-types = <0xfff>;
		virtual-addr-pool = <0x25800000 0xba800000>;
		};
		@@ -88,7 +88,7 @@
		iommus = <&apps_smmu 0x2104 0x0400>;
		qcom,iommu-dma-addr-pool = <0x01000000 0x24800000>;
		qcom,iommu-faults = "non-fatal";
		qcom,iommu-pagetables = "LLC";
		qcom,iommu-pagetable = "LLC";
		qcom,iommu-vmid = <0xB>; /VMID_CP_NON_PIXEL/
		buffer-types = <0x480>;
		virtual-addr-pool = <0x01000000 0x24800000>;
		@@ -101,7 +101,7 @@
		iommus = <&apps_smmu 0x2101 0x0404>;
		qcom,iommu-dma-addr-pool = <0x00500000 0xdfb00000>;
		qcom,iommu-faults = "non-fatal";
		qcom,iommu-pagetables = "LLC";
		qcom,iommu-pagetable = "LLC";
		qcom,iommu-vmid = <0x9>; /VMID_CP_BITSTREAM/
		buffer-types = <0x241>;
		virtual-addr-pool = <0x00500000 0xdfb00000>;
		@@ -114,7 +114,7 @@
		iommus = <&apps_smmu 0x2103 0x0400>;
		qcom,iommu-dma-addr-pool = <0x00500000 0xdfb00000>;
		qcom,iommu-faults = "non-fatal";
		qcom,iommu-pagetables = "LLC";
		qcom,iommu-pagetable = "LLC";
		qcom,iommu-vmid = <0xA>; /VMID_CP_PIXEL/
		buffer-types = <0x106>;
		virtual-addr-pool = <0x00500000 0xdfb00000>;

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

+15 −15

Original line number	Diff line number	Diff line
		@@ -2539,7 +2539,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;
		};
		@@ -2548,7 +2548,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;
		};
		@@ -2557,7 +2557,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;
		};
		@@ -2566,7 +2566,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;
		};
		@@ -2575,7 +2575,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;
		};
		@@ -2584,7 +2584,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;
		};
		@@ -2593,7 +2593,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;
		};
		@@ -2602,7 +2602,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;
		};
		@@ -2612,7 +2612,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;
		@@ -2622,7 +2622,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;
		};
		@@ -2631,7 +2631,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;
		};
		@@ -2640,7 +2640,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;
		};
		@@ -2649,7 +2649,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;
		};
		@@ -2658,7 +2658,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;
		};
		@@ -2667,7 +2667,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;