summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-03-04 21:14:47 +0100
committerArnd Bergmann <arnd@arndb.de>2015-03-04 21:14:47 +0100
commitbc761616864fedd1665ba7a0d68d3f4d9681408c (patch)
tree174ac29d991fa28fe7ded878bc9f280bebfe3dbf /Documentation
parent0be32d2f07b0ee0d1f465a504a918ec4e75168c9 (diff)
parent2141102e045e622cac176891cb66c5bf08e439f5 (diff)
downloadlinux-bc761616864fedd1665ba7a0d68d3f4d9681408c.tar.bz2
Merge tag 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into fixes
Merge "First fixes batch for AT91 on 4.0" from Nicolas Ferre: - PM slowclock fixes for DDR and timeouts - fix some DT entries - little defconfig updates - the removal of a harmful watchdog option + its detailed documentation * tag 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: ARM: at91/dt: keep watchdog running in idle mode dts: Documentation: AT91 Watchdog, explain what atmel,idle-halt property really do ARM: at91/defconfig: add at91rm9200 ethernet support ARM: at91/defconfig: remove CONFIG_SYSFS_DEPRECATED ARM: at91/dt: at91sam9260: fix usart pinctrl ARM: at91/dt: sama5d4: add missing alias for i2c0 ARM: at91/dt: at91sam9263: Fixup sram1 device tree node ARM: at91: pm: fix SRAM allocation ARM: at91: pm: fix at91rm9200 standby pm: at91: Workaround DDRSDRC self-refresh bug with LPDDR1 memories. pm: at91: pm_slowclock: fix suspend/resume hang up in timeouts
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/watchdog/atmel-wdt.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt
index f90e294d7631..a4d869744f59 100644
--- a/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt
@@ -26,6 +26,11 @@ Optional properties:
- atmel,disable : Should be present if you want to disable the watchdog.
- atmel,idle-halt : Should be present if you want to stop the watchdog when
entering idle state.
+ CAUTION: This property should be used with care, it actually makes the
+ watchdog not counting when the CPU is in idle state, therefore the
+ watchdog reset time depends on mean CPU usage and will not reset at all
+ if the CPU stop working while it is in idle state, which is probably
+ not what you want.
- atmel,dbg-halt : Should be present if you want to stop the watchdog when
entering debug state.