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

Commit 9eaa8487 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: Update flash LED headroom and startup delay"

parents ce931fc5 2f50bf1d

Documentation/devicetree/bindings/leds/leds-qpnp.txt

+2 −2
Original line number Diff line number Diff line
@@ -38,10 +38,10 @@ Optional properties for WLED: 
Flash is used primarily as a camera or video flash.



Optional properties for flash:

- qcom,headroom: headroom to use, mV

- qcom,headroom: headroom to use. Values should be 0, 1, 2, 3 for 250mV, 300mV, 400mV and 500mV

- qcom,duration: duration of the flash and torch, 10ms - 1280ms for flash and 2s - 33s for torch

- qcom,clamp-curr: current to clamp at, mA

- qcom,startup-dly: delay before flashing after flash executed, us

- qcom,startup-dly: delay before flashing after flash executed. Values should 0, 1, 2, 3 for 10us, 32us, 64us, and 128us

- qcom,saftey-timer: include for safety timer use, otherwise watchdog timer will be used

- linux,default-trigger: trigger the led from external modules such as display

- qcom,default-state:  default state of the led, should be "on" or "off"

arch/arm/boot/dts/msm-pm8226.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -837,10 +837,10 @@ 
			pm8226_flash0: qcom,flash_0 {

				qcom,max-current = <1000>;

				qcom,default-state = "off";

				qcom,headroom = <0>;

				qcom,headroom = <3>;

				qcom,duration = <1280>;

				qcom,clamp-curr = <200>;

				qcom,startup-dly = <1>;

				qcom,startup-dly = <3>;

				qcom,safety-timer;

				label = "flash";

				linux,default-trigger =
@@ -853,10 +853,10 @@ 
			pm8226_flash1: qcom,flash_1 {

				qcom,max-current = <1000>;

				qcom,default-state = "off";

				qcom,headroom = <0>;

				qcom,headroom = <3>;

				qcom,duration = <1280>;

				qcom,clamp-curr = <200>;

				qcom,startup-dly = <1>;

				qcom,startup-dly = <3>;

				qcom,safety-timer;

				linux,default-trigger =

						"flash1_trigger";