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

Commit 7c091322 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 support to discard a region in dma space" into camera-kernel.lnx.1.0

parents 8b3c55b2 73df0ed5

kona-camera.dtsi

+5 −3
Original line number Diff line number Diff line
@@ -430,7 +430,8 @@ 
				<&apps_smmu 0x2420 0x400>,

				<&apps_smmu 0x2421 0x400>;

			label = "icp";

			qcom,iommu-dma-addr-pool = <0x10c00000 0xcf300000>;

			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 */
@@ -460,11 +461,12 @@ 
				};



				iova-mem-region-io {

					/* IO region is approximately 3.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";

				};

lito-camera.dtsi

+5 −3
Original line number Diff line number Diff line
@@ -386,7 +386,8 @@ 
				<&apps_smmu 0x1260 0x0>;

			label = "icp";

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

			qcom,iommu-dma-addr-pool = <0x10c00000 0xcf300000>;

			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 */
@@ -416,11 +417,12 @@ 
				};



				iova-mem-region-io {

					/* IO region is approximately 3.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";

				};