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

Commit d4033007 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 camera flash dtsi for msm8937 DTP"

parents 3200371d adfcb037

arch/arm/boot/dts/qcom/msm8937-camera-sensor-qrd.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 
		qcom,csid-sd-index = <0>;

		qcom,mount-angle = <90>;

		qcom,actuator-src = <&actuator0>;

		qcom,led-flash-src = <&led_flash0>;

		qcom,eeprom-src = <&eeprom0>;

		cam_vdig-supply = <&pm8937_l23>;

		cam_vana-supply = <&pm8937_l22>;

arch/arm/boot/dts/qcom/msm8937-pmi8937-qrd-sku2.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -36,6 +36,15 @@ 
};



&soc {

	led_flash0: qcom,camera-flash {

		cell-index = <0>;

		compatible = "qcom,camera-flash";

		qcom,flash-type = <1>;

		qcom,flash-source = <&pmi8937_flash0 &pmi8937_flash1>;

		qcom,torch-source = <&pmi8937_torch0 &pmi8937_torch1>;

		qcom,switch-source = <&pmi8937_switch>;

	};



	i2c@78b7000 {

		status = "ok";

		focaltech@38 {

arch/arm/boot/dts/qcom/msm8937-pmi8950-qrd-sku1.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -36,6 +36,15 @@ 
};



&soc {

	led_flash0: qcom,camera-flash {

		cell-index = <0>;

		compatible = "qcom,camera-flash";

		qcom,flash-type = <1>;

		qcom,flash-source = <&pmi8950_torch0 &pmi8950_torch1>;

		qcom,torch-source = <&pmi8950_torch0 &pmi8950_torch1>;

		qcom,switch-source = <&pmi8950_switch>;

	};



	i2c@78b7000 {

		status = "ok";

		synaptics@20 {