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

Commit 0ec23433 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add iommu cells count for msm8937 and sdm660"

parents 181aed32 e2ab33cc

qcom/msm8937-camera.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ 
			compatible = "qcom,msm-cam-smmu-cb";

			iommus = <&apps_iommu 0x400 0x00>,

				<&apps_iommu 0x2400 0x00>;

			iommu-cells = <2>;

			qcom,iommu-dma-addr-pool = <0x10000000 0x70000000>;

			label = "vfe";

			qcom,scratch-buf-support;
@@ -314,6 +315,7 @@ 
		msm_cam_smmu_cb3: msm_cam_smmu_cb3 {

			compatible = "qcom,msm-cam-smmu-cb";

			iommus = <&apps_iommu 0x1c00 0x00>;

			iommu-cells = <2>;

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

			label = "cpp";

		};
@@ -321,6 +323,7 @@ 
		msm_cam_smmu_cb4: msm_cam_smmu_cb4 {

			compatible = "qcom,msm-cam-smmu-cb";

			iommus = <&apps_iommu 0x1800 0x00>;

			iommu-cells = <2>;

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

			label = "jpeg_enc0";

		};

qcom/qm215-camera.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ 
			compatible = "qcom,msm-cam-smmu-cb";

			iommus = <&apps_iommu 0x400 0x00>,

				<&apps_iommu 0x2400 0x00>;

			iommu-cells = <2>;

			qcom,iommu-dma-addr-pool = <0x10000000 0x70000000>;

			label = "vfe";

			qcom,scratch-buf-support;
@@ -312,6 +313,7 @@ 
		msm_cam_smmu_cb3: msm_cam_smmu_cb3 {

			compatible = "qcom,msm-cam-smmu-cb";

			iommus = <&apps_iommu 0x1c00 0x00>;

			iommu-cells = <2>;

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

			label = "cpp";

		};
@@ -319,6 +321,7 @@ 
		msm_cam_smmu_cb4: msm_cam_smmu_cb4 {

			compatible = "qcom,msm-cam-smmu-cb";

			iommus = <&apps_iommu 0x1800 0x00>;

			iommu-cells = <2>;

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

			label = "jpeg_enc0";

		};

qcom/sdm660-camera.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -298,6 +298,7 @@ 
					<&mmss_bimc_smmu 0xc01>,

					<&mmss_bimc_smmu 0xc02>,

					<&mmss_bimc_smmu 0xc03>;

			iommu-cells = <1>;

			label = "vfe";

			qcom,scratch-buf-support;

		};
@@ -305,18 +306,21 @@ 
		msm_cam_smmu_cb2 {

			compatible = "qcom,msm-cam-smmu-cb";

			iommus = <&mmss_bimc_smmu 0xa00>;

			iommu-cells = <1>;

			label = "cpp";

		};



		msm_cam_smmu_cb4 {

			compatible = "qcom,msm-cam-smmu-cb";

			iommus = <&mmss_bimc_smmu 0x800>;

			iommu-cells = <1>;

			label = "jpeg_enc0";

		};



		msm_cam_smmu_cb5 {

			compatible = "qcom,msm-cam-smmu-cb";

			iommus = <&mmss_bimc_smmu 0x801>;

			iommu-cells = <1>;

			label = "jpeg_dma";

		};

	};