commit f1e80107d44b5a783197c55540b9abcc9b5522c3
author Linux Build Service Account <lnxbuild@localhost> Tue May 21 06:12:57 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue May 21 06:12:57 2013 -0700
tree c7546bcd1cd780834e54553602be807ce6717df2
parent fda44396356acc05512675d133d589e0c320ba45
parent 62571b2124429ab18b10ad9145ffe2711eea715e

Merge "arm/dt: msm8974-leds: Update flash LED default settings"

arch/arm/boot/dts/msm8974-leds.dtsi

diff --git a/arch/arm/boot/dts/msm8974-leds.dtsi b/arch/arm/boot/dts/msm8974-leds.dtsi
index b39cc21..c4780b0 100644
--- a/arch/arm/boot/dts/msm8974-leds.dtsi
+++ b/arch/arm/boot/dts/msm8974-leds.dtsi
@@ -65,10 +65,10 @@
 			pm8941_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 =
@@ -81,10 +81,10 @@
 			pm8941_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";

drivers/leds/leds-qpnp.c

diff --git a/drivers/leds/leds-qpnp.c b/drivers/leds/leds-qpnp.c
index 0233e18..0f238b2 100644
--- a/drivers/leds/leds-qpnp.c
+++ b/drivers/leds/leds-qpnp.c
@@ -1631,7 +1631,7 @@
 	if (!rc)
 		led->flash_cfg->headroom = (u8) val;
 	else if (rc == -EINVAL)
-		led->flash_cfg->headroom = HEADROOM_300mV;
+		led->flash_cfg->headroom = HEADROOM_500mV;
 	else
 		return rc;
 
@@ -1656,7 +1656,7 @@
 	if (!rc)
 		led->flash_cfg->startup_dly = (u8) val;
 	else if (rc == -EINVAL)
-		led->flash_cfg->startup_dly = DELAY_32us;
+		led->flash_cfg->startup_dly = DELAY_128us;
 	else
 		return rc;