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

Commit f9e6b2e9 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: Enable camera nodes for 8952"

parents 06783ce6 3fc64402

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

+4 −4
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
		qcom,cam-power-seq-val = "cam_vio";

		qcom,cam-power-seq-cfg-val = <1>;

		qcom,cam-power-seq-delay = <1>;

		status = "disabled";

		status = "ok";

	};



	qcom,camera@0 {
@@ -89,7 +89,7 @@ 
		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "disabled";

		status = "ok";

		clocks = <&clock_gcc clk_mclk0_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk0_clk>;

		clock-names = "cam_src_clk", "cam_clk";
@@ -127,7 +127,7 @@ 
		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "disabled";

		status = "ok";

		clocks = <&clock_gcc clk_mclk1_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk1_clk>;

		clock-names = "cam_src_clk", "cam_clk";
@@ -165,7 +165,7 @@ 
		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "disabled";

		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/msm8952-camera-sensor-qrd.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 
			"sensor_gpio_standby";

		qcom,cam-power-seq-cfg-val = <1 1 1 24000000 1 1>;

		qcom,cam-power-seq-delay = <1 1 5 5 5 10>;

		status = "disabled";

		status = "ok";

		clocks = <&clock_gcc clk_mclk0_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk0_clk>;

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

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "disabled";

		status = "ok";

		clocks = <&clock_gcc clk_mclk0_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk0_clk>;

		clock-names = "cam_src_clk", "cam_clk";
@@ -254,7 +254,7 @@ 
		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "disabled";

		status = "ok";

		clocks = <&clock_gcc clk_mclk1_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk1_clk>;

		clock-names = "cam_src_clk", "cam_clk";
@@ -303,7 +303,7 @@ 
		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "disabled";

		status = "ok";

		clocks = <&clock_gcc clk_mclk2_clk_src>,

			<&clock_gcc clk_gcc_camss_mclk2_clk>;

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