commit 9a0b4de70bb75f0026fbe54babed401813fa50bd
author Linux Build Service Account <lnxbuild@localhost> Fri Jun 21 02:31:42 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jun 21 02:31:39 2013 -0700
tree f3a9148ddd7b4f212a5c32ce05e9647f355967b2
parent e9d2f3e3f48a514e4dae86833b3748577487fdfa
parent 803f0f1cd29f202e69d9a4f1adca2b640f619e56

Merge "arm/dt: msm8610: add led gpio flash node in qrd dt"

arch/arm/boot/dts/msm8610-qrd.dts

diff --git a/arch/arm/boot/dts/msm8610-qrd.dts b/arch/arm/boot/dts/msm8610-qrd.dts
index 90225c0..7b45194 100644
--- a/arch/arm/boot/dts/msm8610-qrd.dts
+++ b/arch/arm/boot/dts/msm8610-qrd.dts
@@ -78,6 +78,15 @@
 		};
 	};
 
+	flashlight {
+		compatible = "qcom,leds-gpio-flash";
+		status = "okay";
+		qcom,flash-en = <&msmgpio 18 0>;
+		qcom,flash-now = <&msmgpio 19 0>;
+		linux,name = "flashlight";
+		linux,default-trigger = "flashlight-trigger";
+	};
+
 	gpio_keys {
                 compatible = "gpio-keys";
                 input-name = "gpio-keys";