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

Commit 962b5d47 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: Handle 23.88Mhz Mclk support for 8916 & 8939"

parents 1bfd3d1e bfbc7021

arch/arm/boot/dts/qcom/msm8916-camera-sensor-cdp.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		qcom,mclk-23880000;

		clocks = <&clock_gcc clk_mclk1_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk1_clk>;

		clock-names = "cam_src_clk", "cam_clk";
@@ -114,6 +115,7 @@ 
		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		qcom,mclk-23880000;

		status = "ok";

		clocks = <&clock_gcc clk_mclk0_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk0_clk>;
@@ -149,6 +151,7 @@ 
			"CAM_RESET",

			"CAM_STANDBY";

		qcom,cci-master = <0>;

		qcom,mclk-23880000;

		status = "ok";

		clocks = <&clock_gcc clk_mclk1_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk1_clk>;

arch/arm/boot/dts/qcom/msm8916-camera-sensor-mtp.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		qcom,mclk-23880000;

		clocks = <&clock_gcc clk_mclk1_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk1_clk>;

		clock-names = "cam_src_clk", "cam_clk";
@@ -114,6 +115,7 @@ 
		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		qcom,mclk-23880000;

		status = "ok";

		clocks = <&clock_gcc clk_mclk0_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk0_clk>;
@@ -149,6 +151,7 @@ 
			"CAM_RESET",

			"CAM_STANDBY";

		qcom,cci-master = <0>;

		qcom,mclk-23880000;

		status = "ok";

		clocks = <&clock_gcc clk_mclk1_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk1_clk>;