-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'linux-watchdog-4.20-rc1' of git://www.linux-watchdog.org/l…
…inux-watchdog Pull watchdog updates from Wim Van Sebroeck: - Add Armada 37xx CPU watchdog - w83627hf_wdt: Add Support for NCT6796D, NCT6797D, NCT6798D - hpwdt: several improvements - renesas_wdt: SPDX identifiers, stop when unregistering, support for R7S9210 - rza_wdt: SPDX identifiers, support longer timeouts - core: fix null pointer dereference when releasing cdev - iTCO_wdt: Drop option vendorsupport=2 - sama5d4: fix timeout-sec usage - lantiq_wdt: convert to watchdog framework - several small fixes * tag 'linux-watchdog-4.20-rc1' of git://www.linux-watchdog.org/linux-watchdog: (30 commits) watchdog: ts4800: release syscon device node in ts4800_wdt_probe() watchdog: armada_37xx_wdt: use do_div for u64 division documentation: watchdog: add documentation for armada-37xx-wdt dt-bindings: watchdog: Document armada-37xx-wdt binding watchdog: Add support for Armada 37xx CPU watchdog dt-bindings: watchdog: add mpc8xxx-wdt support watchdog: mpc8xxx: provide boot status MAINTAINERS: Fix file pattern for MEN Z069 watchdog driver dt-bindings: watchdog: renesas-wdt: Add support for R7S9210 watchdog: rza_wdt: Support longer timeouts watchdog: hpwdt: Disable PreTimeout when Timeout is smaller watchdog: w83627hf_wdt: Support NCT6796D, NCT6797D, NCT6798D watchdog: mpc8xxx: use dev_xxxx() instead of pr_xxxx() watchdog: lantiq: add get_timeleft callback watchdog: lantiq: Convert to watchdog_device watchdog: lantiq: update register names to better match spec watchdog: sama5d4: fix timeout-sec usage watchdog: fix a small number of "watchog" typos in comments watchdog: rza_wdt: convert to SPDX identifiers watchdog: iTCO_wdt: Remove unused hooks ...
- Loading branch information
Showing
23 changed files
with
783 additions
and
454 deletions.
There are no files selected for viewing
23 changes: 23 additions & 0 deletions
23
Documentation/devicetree/bindings/watchdog/armada-37xx-wdt.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
* Armada 37xx CPU Watchdog Timer Controller | ||
|
||
Required properties: | ||
- compatible : must be "marvell,armada-3700-wdt" | ||
- reg : base physical address of the controller and length of memory mapped | ||
region. | ||
- clocks : the clock feeding the watchdog timer. See clock-bindings.txt | ||
- marvell,system-controller : reference to syscon node for the CPU Miscellaneous | ||
Registers | ||
|
||
Example: | ||
|
||
cpu_misc: system-controller@d000 { | ||
compatible = "marvell,armada-3700-cpu-misc", "syscon"; | ||
reg = <0xd000 0x1000>; | ||
}; | ||
|
||
wdt: watchdog@8300 { | ||
compatible = "marvell,armada-3700-wdt"; | ||
reg = <0x8300 0x40>; | ||
marvell,system-controller = <&cpu_misc>; | ||
clocks = <&xtalclk>; | ||
}; |
25 changes: 25 additions & 0 deletions
25
Documentation/devicetree/bindings/watchdog/mpc8xxx-wdt.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
* Freescale mpc8xxx watchdog driver (For 83xx, 86xx and 8xx) | ||
|
||
Required properties: | ||
- compatible: Shall contain one of the following: | ||
"mpc83xx_wdt" for an mpc83xx | ||
"fsl,mpc8610-wdt" for an mpc86xx | ||
"fsl,mpc823-wdt" for an mpc8xx | ||
- reg: base physical address and length of the area hosting the | ||
watchdog registers. | ||
On the 83xx, "Watchdog Timer Registers" area: <0x200 0x100> | ||
On the 86xx, "Watchdog Timer Registers" area: <0xe4000 0x100> | ||
On the 8xx, "General System Interface Unit" area: <0x0 0x10> | ||
|
||
Optional properties: | ||
- reg: additional physical address and length (4) of location of the | ||
Reset Status Register (called RSTRSCR on the mpc86xx) | ||
On the 83xx, it is located at offset 0x910 | ||
On the 86xx, it is located at offset 0xe0094 | ||
On the 8xx, it is located at offset 0x288 | ||
|
||
Example: | ||
WDT: watchdog@0 { | ||
compatible = "fsl,mpc823-wdt"; | ||
reg = <0x0 0x10 0x288 0x4>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.