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

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

Merge "ARM: dts: qcom: Enable camera for QM215 on kernel-4.19"

parents 7f9befad 8fb5dd05

qcom/msm8917-camera.dtsi

+1 −7
Original line number Diff line number Diff line
@@ -308,12 +308,6 @@ 
			qcom,scratch-buf-support;

		};



		msm_cam_smmu_cb2: msm_cam_smmu_cb2 {

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

			label = "vfe_secure";

			qcom,secure-context;

		};



		msm_cam_smmu_cb3: msm_cam_smmu_cb3 {

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

			iommus = <&apps_iommu 0x1c00 0x00>;
@@ -382,7 +376,7 @@ 
			"camss_top_ahb_clk", "camss_vfe_cpp_ahb_clk",

			"camss_vfe_cpp_axi_clk", "camss_vfe_cpp_clk",

			"micro_iface_clk", "camss_ahb_clk";

		qcom,clock-rates = <61540000 180000000 0 0 0 180000000 0 0>;

		qcom,src-clock-rates = <61540000 180000000 0 0 0 180000000 0 0>;

		qcom,min-clock-rate = <133000000>;

		resets = <&gcc GCC_CAMSS_MICRO_BCR>;

		reset-names = "micro_iface_reset";

qcom/qm215-camera.dtsi

+2 −7
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ 
	qcom,cam_smmu {

		status = "ok";

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

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

		msm_cam_smmu_cb1: msm_cam_smmu_cb1 {

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

			iommus = <&apps_iommu 0x400 0x00>,
@@ -308,12 +309,6 @@ 
			qcom,scratch-buf-support;

		};



		msm_cam_smmu_cb2: msm_cam_smmu_cb2 {

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

			label = "vfe_secure";

			qcom,secure-context;

		};



		msm_cam_smmu_cb3: msm_cam_smmu_cb3 {

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

			iommus = <&apps_iommu 0x1c00 0x00>;
@@ -382,7 +377,7 @@ 
			"camss_top_ahb_clk", "camss_vfe_cpp_ahb_clk",

			"camss_vfe_cpp_axi_clk", "camss_vfe_cpp_clk",

			"micro_iface_clk", "camss_ahb_clk";

		qcom,clock-rates = <61540000 180000000 0 0 0 180000000 0 0>;

		qcom,src-clock-rates = <61540000 180000000 0 0 0 180000000 0 0>;

		qcom,min-clock-rate = <133000000>;

		resets = <&gcc GCC_CAMSS_MICRO_BCR>;

		reset-names = "micro_iface_reset";