Merge "ARM: dts: msm: enable simple led flash controlled by gpio for QRD SKUAB"
diff --git a/arch/arm/boot/dts/msm8610-qrd-skuab.dtsi b/arch/arm/boot/dts/msm8610-qrd-skuab.dtsi
index 2fe6a34..08e9be5 100644
--- a/arch/arm/boot/dts/msm8610-qrd-skuab.dtsi
+++ b/arch/arm/boot/dts/msm8610-qrd-skuab.dtsi
@@ -13,6 +13,16 @@
/include/ "msm8610-qrd.dtsi"
&soc {
+ gpio-leds {
+ compatible = "gpio-leds";
+ status = "disabled";
+
+ gpio_flash: gpio-flash {
+ gpios = <&pm8110_gpios 1 0>;
+ label = "gpio-flash";
+ linux,default-trigger = "gpio_flash_trigger";
+ };
+ };
sound {
qcom,model = "msm8x10-skuab-snd-card";
diff --git a/arch/arm/boot/dts/msm8610-v2-qrd-skuab-dvt2.dts b/arch/arm/boot/dts/msm8610-v2-qrd-skuab-dvt2.dts
index 9867ca6..e9f086d 100644
--- a/arch/arm/boot/dts/msm8610-v2-qrd-skuab-dvt2.dts
+++ b/arch/arm/boot/dts/msm8610-v2-qrd-skuab-dvt2.dts
@@ -21,3 +21,16 @@
compatible = "qcom,msm8610-qrd", "qcom,msm8610", "qcom,qrd";
qcom,board-id = <0x2000b 3>;
};
+
+&soc {
+ gpio-leds {
+ status = "ok";
+ };
+};
+
+&pm8110_gpios {
+ gpio@c000 { /* GPIO 1 */
+ reg = <0xc000 0x100>;
+ qcom,pin-num = <1>;
+ };
+};