Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog changes from Wim Van Sebroeck: - addition of MOXA ART watchdog driver (moxart_wdt) - addition of CSR SiRFprimaII and SiRFatlasVI watchdog driver (sirfsoc_wdt) - addition of ralink watchdog driver (rt2880_wdt) - various fixes and cleanups (__user annotation, ioctl return codes, removal of redundant of_match_ptr, removal of unnecessary amba_set_drvdata(), use allocated buffer for usb_control_msg, ...) - removal of MODULE_ALIAS_MISCDEV statements - watchdog related DT bindings - first set of improvements on the w83627hf_wdt driver * git://www.linux-watchdog.org/linux-watchdog: (26 commits) watchdog: w83627hf: Use helper functions to access superio registers watchdog: w83627hf: Enable watchdog device only if not already enabled watchdog: w83627hf: Enable watchdog only once watchdog: w83627hf: Convert to watchdog infrastructure watchdog: omap_wdt: raw read and write endian fix watchdog: sirf: don't depend on dummy value of CLOCK_TICK_RATE watchdog: pcwd_usb: overflow in usb_pcwd_send_command() watchdog: rt2880_wdt: fix return value check in rt288x_wdt_probe() watchdog: watchdog_core: Fix a trivial typo watchdog: dw: Enable OF support for DW watchdog timer watchdog: Get rid of MODULE_ALIAS_MISCDEV statements watchdog: ts72xx_wdt: Propagate return value from timeout_to_regval watchdog: pcwd_usb: Use allocated buffer for usb_control_msg watchdog: sp805_wdt: Remove unnecessary amba_set_drvdata() watchdog: sirf: add watchdog driver of CSR SiRFprimaII and SiRFatlasVI watchdog: Remove redundant of_match_ptr watchdog: ts72xx_wdt: cleanup return codes in ioctl documentation/devicetree: Move DT bindings from gpio to watchdog watchdog: add ralink watchdog driver watchdog: Add MOXA ART watchdog driver ...
This commit is contained in:
21
Documentation/devicetree/bindings/watchdog/dw_wdt.txt
Normal file
21
Documentation/devicetree/bindings/watchdog/dw_wdt.txt
Normal file
@@ -0,0 +1,21 @@
|
||||
Synopsys Designware Watchdog Timer
|
||||
|
||||
Required Properties:
|
||||
|
||||
- compatible : Should contain "snps,dw-wdt"
|
||||
- reg : Base address and size of the watchdog timer registers.
|
||||
- clocks : phandle + clock-specifier for the clock that drives the
|
||||
watchdog timer.
|
||||
|
||||
Optional Properties:
|
||||
|
||||
- interrupts : The interrupt used for the watchdog timeout warning.
|
||||
|
||||
Example:
|
||||
|
||||
watchdog0: wd@ffd02000 {
|
||||
compatible = "snps,dw-wdt";
|
||||
reg = <0xffd02000 0x1000>;
|
||||
interrupts = <0 171 4>;
|
||||
clocks = <&per_base_clk>;
|
||||
};
|
@@ -0,0 +1,15 @@
|
||||
MOXA ART Watchdog timer
|
||||
|
||||
Required properties:
|
||||
|
||||
- compatible : Must be "moxa,moxart-watchdog"
|
||||
- reg : Should contain registers location and length
|
||||
- clocks : Should contain phandle for the clock that drives the counter
|
||||
|
||||
Example:
|
||||
|
||||
watchdog: watchdog@98500000 {
|
||||
compatible = "moxa,moxart-watchdog";
|
||||
reg = <0x98500000 0x10>;
|
||||
clocks = <&coreclk>;
|
||||
};
|
19
Documentation/devicetree/bindings/watchdog/rt2880-wdt.txt
Normal file
19
Documentation/devicetree/bindings/watchdog/rt2880-wdt.txt
Normal file
@@ -0,0 +1,19 @@
|
||||
Ralink Watchdog Timers
|
||||
|
||||
Required properties:
|
||||
- compatible: must be "ralink,rt2880-wdt"
|
||||
- reg: physical base address of the controller and length of the register range
|
||||
|
||||
Optional properties:
|
||||
- interrupt-parent: phandle to the INTC device node
|
||||
- interrupts: Specify the INTC interrupt number
|
||||
|
||||
Example:
|
||||
|
||||
watchdog@120 {
|
||||
compatible = "ralink,rt2880-wdt";
|
||||
reg = <0x120 0x10>;
|
||||
|
||||
interrupt-parent = <&intc>;
|
||||
interrupts = <1>;
|
||||
};
|
14
Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
Normal file
14
Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
Normal file
@@ -0,0 +1,14 @@
|
||||
SiRFSoC Timer and Watchdog Timer(WDT) Controller
|
||||
|
||||
Required properties:
|
||||
- compatible: "sirf,prima2-tick"
|
||||
- reg: Address range of tick timer/WDT register set
|
||||
- interrupts: interrupt number to the cpu
|
||||
|
||||
Example:
|
||||
|
||||
timer@b0020000 {
|
||||
compatible = "sirf,prima2-tick";
|
||||
reg = <0xb0020000 0x1000>;
|
||||
interrupts = <0>;
|
||||
};
|
Reference in New Issue
Block a user