summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-21 00:48:30 -0800
committerOlof Johansson <olof@lixom.net>2012-11-21 02:13:09 -0800
commitea091f6dbd2e5df03b6bbb11467c553ebedd16a2 (patch)
treeca56b1edbba82dd2ff2e02bc21af279893955c4d /Documentation
parentef173de1239afa32e7209c375a703da8c6cc7a7c (diff)
parent805504abdc73cfc745a5fee3d616cdb24bb2a68c (diff)
downloadlinux-ea091f6dbd2e5df03b6bbb11467c553ebedd16a2.tar.gz
Merge tag 'bcm2835-for-3.8-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/soc
From Stephen Warren: ARM: bcm2835: core SoC enhancements A machine restart/reboot implementation is added. The GPIO/pinmux controller is instantiated, and dummy gpio.h added. * tag 'bcm2835-for-3.8-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi: ARM: bcm2835: enable GPIO/pinctrl ARM: bcm2835: implement machine restart hook Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/watchdog/brcm,bcm2835-pm-wdog.txt13
1 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/watchdog/brcm,bcm2835-pm-wdog.txt b/Documentation/devicetree/bindings/watchdog/brcm,bcm2835-pm-wdog.txt
new file mode 100644
index 000000000000..d209366b4a69
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/brcm,bcm2835-pm-wdog.txt
@@ -0,0 +1,13 @@
+BCM2835 Watchdog timer
+
+Required properties:
+
+- compatible : should be "brcm,bcm2835-pm-wdt"
+- reg : Specifies base physical address and size of the registers.
+
+Example:
+
+watchdog {
+ compatible = "brcm,bcm2835-pm-wdt";
+ reg = <0x7e100000 0x28>;
+};