summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-06-11 12:26:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-06-11 12:26:07 -0700
commita2b7ab45b8905b9c1813b0212e82a39d5c081c8a (patch)
treebaa08d60c773c39ff12062df6a6bd887c5398649 /Documentation
parente16c4790de39dc861b749674c2a9319507f6f64f (diff)
parent16a7eec2fcd020c73cf0ca38bf774775167d22eb (diff)
downloadlinux-a2b7ab45b8905b9c1813b0212e82a39d5c081c8a.tar.bz2
Merge tag 'linux-watchdog-4.18-rc1' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck: "Core: - simplify getting .drvdata renesas_wdt: - add support for the R8A77965 WDT and R-Car Gen2 - remove R-Car M2-W ES2.x from blacklist sp805: - add restart handler hpwdt: - claim NMIs generated by iLO5 mena21_wdt: - drop unnecessary mutex lock da9062 & da9063: - fixes and general cleanups" * tag 'linux-watchdog-4.18-rc1' of git://www.linux-watchdog.org/linux-watchdog: watchdog: da9063: remove duplicated timeout_to_sel calls watchdog: da9063: rename helper function to avoid misunderstandings watchdog: da9062: remove unused code watchdog: da9063: Fix timeout handling during probe watchdog: da9063: Fix updating timeout value watchdog: da9063: Fix setting/changing timeout dt-bindings: watchdog: renesas-wdt: Add R-Car Gen2 support watchdog: mena21_wdt: Drop unnecessary mutex lock watchdog: renesas-wdt: Add support for the R8A77965 WDT watchdog: hpwdt: Claim NMIs generated by iLO5 watchdog: sp805: add restart handler watchdog: renesas-wdt: Remove R-Car M2-W ES2.x from blacklist watchdog: simplify getting .drvdata
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/watchdog/renesas-wdt.txt23
1 files changed, 16 insertions, 7 deletions
diff --git a/Documentation/devicetree/bindings/watchdog/renesas-wdt.txt b/Documentation/devicetree/bindings/watchdog/renesas-wdt.txt
index 74b2f03c1515..f24d802b8056 100644
--- a/Documentation/devicetree/bindings/watchdog/renesas-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/renesas-wdt.txt
@@ -1,18 +1,27 @@
Renesas Watchdog Timer (WDT) Controller
Required properties:
-- compatible : Should be "renesas,<soctype>-wdt", and
- "renesas,rcar-gen3-wdt" or "renesas,rza-wdt" as fallback.
+ - compatible : Must be "renesas,<soctype>-wdt", followed by a generic
+ fallback compatible string when compatible with the generic
+ version.
Examples with soctypes are:
- - "renesas,r7s72100-wdt" (RZ/A1)
+ - "renesas,r8a7743-wdt" (RZ/G1M)
+ - "renesas,r8a7745-wdt" (RZ/G1E)
+ - "renesas,r8a7790-wdt" (R-Car H2)
+ - "renesas,r8a7791-wdt" (R-Car M2-W)
+ - "renesas,r8a7792-wdt" (R-Car V2H)
+ - "renesas,r8a7793-wdt" (R-Car M2-N)
+ - "renesas,r8a7794-wdt" (R-Car E2)
- "renesas,r8a7795-wdt" (R-Car H3)
- "renesas,r8a7796-wdt" (R-Car M3-W)
+ - "renesas,r8a77965-wdt" (R-Car M3-N)
- "renesas,r8a77970-wdt" (R-Car V3M)
- "renesas,r8a77995-wdt" (R-Car D3)
-
- When compatible with the generic version, nodes must list the SoC-specific
- version corresponding to the platform first, followed by the generic
- version.
+ - "renesas,r7s72100-wdt" (RZ/A1)
+ The generic compatible string must be:
+ - "renesas,rza-wdt" for RZ/A
+ - "renesas,rcar-gen2-wdt" for R-Car Gen2 and RZ/G
+ - "renesas,rcar-gen3-wdt" for R-Car Gen3
- reg : Should contain WDT registers location and length
- clocks : the clock feeding the watchdog timer.