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

Commit 5483834e 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 led flash for camera driver for QRD SKUAB"

parents ed1486fb b633e48c

Documentation/devicetree/bindings/media/video/msm-camera-flash.txt

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ Required properties: 
- qcom,flash-type : Should contain type flash device

    - 1 for LED flash

    - 2 for strobe flash

    - 3 for simple led flash controlled by one gpio

      This is a low cost led used for camera flash, the led is driven by

      system power, and use a transistor controlled by external pin to

      gate its on/off state.

- qcom,flash-source : Should contain array of phandles to flash source nodes.

    - pm8941_flash0 pm8941_flash1

arch/arm/boot/dts/msm8610-v2-qrd-skuab-dvt2.dts

+10 −0
Original line number Diff line number Diff line
@@ -34,3 +34,13 @@ 
		qcom,pin-num = <1>;

	};

};



&led_flash0 {

	status = "ok";

};



&i2c {

	qcom,camera@20 {

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

	};

};

arch/arm/boot/dts/msm8612-qrd-camera-sensor.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -11,6 +11,17 @@ 
 * GNU General Public License for more details.

 */



&soc {



	led_flash0: qcom,camera-led-flash {

		cell-index = <0>;

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

		qcom,flash-type = <3>;

		qcom,flash-source = <&gpio_flash>;

		qcom,torch-source = <&gpio_flash>;

		status = "disabled";

	};

};

&i2c {



	qcom,camera@20 {