Merge tag 'bcm2835-for-3.11-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/dt

From Stephen Warren:
ARM: bcm2835: device tree updates

Just one patch this time: enable the LED via gpio-leds.

* tag 'bcm2835-for-3.11-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi:
  ARM: bcm2835: Add Raspberry Pi's ACT LED to DT

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 11 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
index aafda174a605..6e9deb786a7d 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -8,6 +8,17 @@
         memory {
                 reg = <0 0x10000000>;
         };
+
+        leds {
+                compatible = "gpio-leds";
+
+                act {
+                        label = "ACT";
+                        gpios = <&gpio 16 1>;
+                        default-state = "keep";
+                        linux,default-trigger = "heartbeat";
+                };
+        };
 };
 
 &gpio {