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

Commit 60b10b8e authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add iommu discard regions for lagoon" into camera-kernel.lnx.1.0

parents 7e08067e 4c487932
Loading
Loading
Loading
Loading
+9 −2
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@
			iommus = <&apps_smmu 0xD40 0x20>,
				<&apps_smmu 0xD60 0x20>;
			label = "lrme";
			qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
			lrme_iova_mem_map: iova-mem-map {
				iova-mem-region-shared {
					/* Shared region is 100MB long */
@@ -369,6 +370,7 @@
				<&apps_smmu 0x860 0xc0>,
				<&apps_smmu 0x880 0x0>;
			label = "ife";
			qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
			ife_iova_mem_map: iova-mem-map {
				/* IO region is approximately 3.4 GB */
				iova-mem-region-io {
@@ -386,6 +388,7 @@
			iommus = <&apps_smmu 0xD00 0x20>,
				<&apps_smmu 0xD20 0x20>;
			label = "jpeg";
			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 {
@@ -412,6 +415,8 @@
				<&apps_smmu 0xCC0 0x20>,
				<&apps_smmu 0xCE0 0x20>;
			label = "icp";
			qcom,iommu-dma-addr-pool = <0x10c00000 0xee300000>;
			iova-region-discard = <0xdff00000 0x300000>;
			icp_iova_mem_map: iova-mem-map {
				iova-mem-region-firmware {
					/* Firmware region is 5MB */
@@ -442,11 +447,12 @@
				};

				iova-mem-region-io {
					/* IO region is approximately 3 GB */
					/* IO region is approximately 3.7 GB */
					iova-region-name = "io";
					iova-region-start = <0x10C00000>;
					iova-region-len = <0xCF300000>;
					iova-region-len = <0xee300000>;
					iova-region-id = <0x3>;
					iova-region-discard = <0xdff00000 0x300000>;
					status = "ok";
				};

@@ -466,6 +472,7 @@
			compatible = "qcom,msm-cam-smmu-cb";
			iommus = <&apps_smmu 0xC80 0x0>;
			label = "cpas-cdm0";
			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 */