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

Commit f7c31519 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: msm: Add rear assist camera device for MSM8953"

parents a4a68b2f 9ba49c44

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

+4 −4
Original line number Diff line number Diff line
@@ -239,10 +239,10 @@ 
		qcom,gpio-req-tbl-label = "CAMIF_MCLK1",

			"CAM_RESET1",

			"CAM_STANDBY1";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "disabled";

		qcom,sensor-position = <0x100>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <1>;

		status = "ok";

		clocks = <&clock_gcc clk_mclk2_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk2_clk>;

		clock-names = "cam_src_clk", "cam_clk";

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

+4 −4
Original line number Diff line number Diff line
@@ -239,10 +239,10 @@ 
		qcom,gpio-req-tbl-label = "CAMIF_MCLK1",

			"CAM_RESET1",

			"CAM_STANDBY1";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "disabled";

		qcom,sensor-position = <0x100>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <1>;

		status = "ok";

		clocks = <&clock_gcc clk_mclk2_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk2_clk>;

		clock-names = "cam_src_clk", "cam_clk";