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

Commit 644ef6ba authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add LED support for Dual Camera for SDM845 target" into dev/msm-4.9-camx

parents 818ea8e0 57c752ef

arch/arm64/boot/dts/qcom/sdm845-camera-sensor-cdp.dtsi

+12 −1
Original line number Diff line number Diff line
@@ -22,10 +22,20 @@ 
		status = "ok";

	};



	led_flash_front: qcom,camera-flash@1 {

	led_flash_rear_aux: qcom,camera-flash@1 {

		cell-index = <1>;

		reg = <0x01 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pmi8998_flash0 &pmi8998_flash1>;

		torch-source = <&pmi8998_torch0 &pmi8998_torch1 >;

		switch-source = <&pmi8998_switch0>;

		status = "ok";

	};



	led_flash_front: qcom,camera-flash@2 {

		cell-index = <2>;

		reg = <0x02 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pmi8998_flash2>;

		torch-source = <&pmi8998_torch2>;

		switch-source = <&pmi8998_switch1>;
@@ -306,6 +316,7 @@ 
		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		actuator-src = <&actuator_rear_aux>;

		led-flash-src = <&led_flash_rear_aux>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_vdig-supply = <&camera_ldo>;

		cam_vio-supply = <&pm8998_lvs1>;

arch/arm64/boot/dts/qcom/sdm845-camera-sensor-mtp.dtsi

+12 −1
Original line number Diff line number Diff line
@@ -22,10 +22,20 @@ 
		status = "ok";

	};



	led_flash_front: qcom,camera-flash@1 {

	led_flash_rear_aux: qcom,camera-flash@1 {

		cell-index = <1>;

		reg = <0x01 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pmi8998_flash0 &pmi8998_flash1>;

		torch-source = <&pmi8998_torch0 &pmi8998_torch1>;

		switch-source = <&pmi8998_switch0>;

		status = "ok";

	};



	led_flash_front: qcom,camera-flash@2 {

		cell-index = <2>;

		reg = <0x02 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pmi8998_flash2>;

		torch-source = <&pmi8998_torch2>;

		switch-source = <&pmi8998_switch1>;
@@ -306,6 +316,7 @@ 
		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		actuator-src = <&actuator_rear_aux>;

		led-flash-src = <&led_flash_rear_aux>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_vdig-supply = <&camera_ldo>;

		cam_vio-supply = <&pm8998_lvs1>;

arch/arm64/boot/dts/qcom/sdm845-interposer-pm660.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -142,6 +142,12 @@ 
	/delete-property/ switch-source;

};



&led_flash_rear_aux {

	/delete-property/ flash-source;

	/delete-property/ torch-source;

	/delete-property/ switch-source;

};



&led_flash_front {

	/delete-property/ flash-source;

	/delete-property/ torch-source;