summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-06-15 00:23:16 (GMT)
committerOlof Johansson <olof@lixom.net>2013-06-15 00:23:16 (GMT)
commit3b2e6296abeefb6f602e1cf1bd67e4e3a9b9ee7e (patch)
tree4b1e71d74de4eb120575a089317c74655d9a9533 /arch
parent9440bd234297d2ea664ebd36345533bc5d3d0b30 (diff)
parent805b4db8076d47a181032a87db8a732fc8d94596 (diff)
downloadlinux-fsl-qoriq-3b2e6296abeefb6f602e1cf1bd67e4e3a9b9ee7e.tar.xz
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/bcm2835-rpi-b.dts11
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 aafda17..6e9deb7 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 {