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

Commit b7f7cf59 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: Disable camera for 8952"

parents 1be27883 05fce62f

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 = "ok";

		status = "disabled";

	};



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

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "ok";

		status = "disabled";

		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 = "ok";

		status = "disabled";

		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 = "ok";

		status = "disabled";

		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-mtp.dtsi

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

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

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

		status = "ok";

		status = "disabled";

	};



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

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "ok";

		status = "disabled";

		clocks = <&clock_gcc clk_mclk0_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk0_clk>;

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

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "ok";

		status = "disabled";

		clocks = <&clock_gcc clk_mclk1_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk1_clk>;

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

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "ok";

		status = "disabled";

		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 = "ok";

		status = "disabled";

		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 = "ok";

		status = "disabled";

		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 = "ok";

		status = "disabled";

		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 = "ok";

		status = "disabled";

		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-mtp.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ 
};



&blsp1_uart2 {

	status = "ok";

	status = "disabled";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_sleep>;

};
@@ -202,7 +202,7 @@ 
&spmi_bus {

	qcom,pm8950@0 {

		qcom,leds@a300 {

			status = "okay";

			status = "disabled";

			qcom,led_mpp_4 {

				label = "mpp";

				linux,name = "button-backlight";
@@ -221,7 +221,7 @@ 
	qcom,pmi8950@3 {

		qcom,leds@d300 {

			compatible = "qcom,qpnp-flash-led";

			status = "okay";

			status = "disabled";

			reg = <0xd300 0x100>;

			pinctrl-names = "flash_led_enable","flash_led_disable";

			pinctrl-0 = <&flash_led_enable>;
@@ -247,7 +247,7 @@ 


	qcom,nonremovable;



	status = "ok";

	status = "disabled";

};



&sdhc_2 {
@@ -274,7 +274,7 @@ 
	interrupt-names = "hc_irq", "pwr_irq", "status_irq";

	cd-gpios = <&msm_gpio 67 0x1>;



	status = "ok";

	status = "disabled";

};



&mdss_mdp {
@@ -351,7 +351,7 @@ 
};



&labibb {

	status = "ok";

	status = "disabled";

	qpnp,qpnp-labibb-mode = "lcd";

};