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

Commit 1affed7d authored by Sridhar Gujje's avatar Sridhar Gujje Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: camera: smmu: Fix camera SID issue" into camera-kernel.lnx.3.1

parents 6baed97f 0d344d8f

bengal-camera.dtsi

+3 −7
Original line number Diff line number Diff line
@@ -197,8 +197,7 @@ 


		msm_cam_smmu_tfe {

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

			iommus = <&apps_smmu 0x400 0x000>,

				<&apps_smmu 0x401 0x000>;

			iommus = <&apps_smmu 0x400 0x000>;

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

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

			label = "tfe";
@@ -217,9 +216,7 @@ 
		msm_cam_smmu_ope {

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

			iommus = <&apps_smmu 0x820 0x000>,

				<&apps_smmu 0x821 0x020>,

				<&apps_smmu 0x840 0x000>,

				<&apps_smmu 0x841 0x000>;

				<&apps_smmu 0x840 0x000>;

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

			multiple-client-devices;

			qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;
@@ -238,8 +235,7 @@ 


		msm_cam_smmu_cpas_cdm {

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

			iommus = <&apps_smmu 0x800 0x000>,

				<&apps_smmu 0x801 0x020>;

			iommus = <&apps_smmu 0x800 0x000>;

			label = "cpas-cdm0";

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

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