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

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

Merge "ARM: dts: msm: Update SMMU mask for jpeg and jpeg_dma"

parents 9d01f432 c45534f2

arch/arm64/boot/dts/qcom/trinket-camera.dtsi

+3 −3
Original line number Original line Diff line number Diff line
@@ -271,12 +271,12 @@ 




		msm_cam_smmu_cb4 {

		msm_cam_smmu_cb4 {

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

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

			iommus = <&apps_smmu 0x820 0x0001>;

			iommus = <&apps_smmu 0x820 0x0000>;

			label = "jpeg_enc0";

			label = "jpeg_enc0";

		};

		};

		msm_cam_smmu_cb5 {

		msm_cam_smmu_cb5 {

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

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

			iommus = <&apps_smmu 0x821 0x0001>;

			iommus = <&apps_smmu 0x821 0x0000>;

			label = "jpeg_dma";

			label = "jpeg_dma";

		};

		};
@@ -664,7 +664,7 @@ 
		clock-names = "mmss_camss_ahb_clk",

		clock-names = "mmss_camss_ahb_clk",

			"mmss_camss_top_ahb_clk",

			"mmss_camss_top_ahb_clk",

			"core_src_clk",

			"core_src_clk",

			"core_src",

			"core_clk",

			"mmss_camss_jpeg_ahb_clk",

			"mmss_camss_jpeg_ahb_clk",

			"mmss_camss_jpeg_axi_clk";

			"mmss_camss_jpeg_axi_clk";

		clocks = <&clock_gcc GCC_CAMERA_AHB_CLK>,

		clocks = <&clock_gcc GCC_CAMERA_AHB_CLK>,