Commit 41531f58 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-watchdog-4.17-rc1' of git://www.linux-watchdog.org/linux-watchdog 

Pull watchdog updates from Wim Van Sebroeck:

 - Add Nuvoton NPCM watchdog driver

 - renesas_wdt: Add R-Car Gen2 support

 - renesas_wdt: add suspend/resume and restart handler support

 - hpwdt: convert to watchdog core and improve NMI

 - improve timeout setting/handling in various drivers

 - coh901327: make license text and module licence match

 - fix error handling in asm9260_wdt, sprd_wdt and davinci_wdt

 - aspeed imrovements

 - dw improvements (for control register & suspend/resume)

 - add SPDX identifiers for watchdog subsystem

* tag 'linux-watchdog-4.17-rc1' of git://www.linux-watchdog.org/linux-watchdog: (35 commits)
  watchdog: davinci_wdt: fix error handling in davinci_wdt_probe()
  watchdog: add SPDX identifiers for watchdog subsystem
  watchdog: aspeed: Allow configuring for alternate boot
  watchdog: Add Nuvoton NPCM watchdog driver
  dt-bindings: watchdog: Add Nuvoton NPCM description
  watchdog: dw: save/restore control and timeout across suspend/resume
  watchdog: dw: RMW the control register
  watchdog: sprd_wdt: Fix error handling in sprd_wdt_enable()
  watchdog: aspeed: Fix translation of reset mode to ctrl register
  watchdog: renesas_wdt: Add restart handler
  watchdog: renesas_wdt: Add R-Car Gen2 support
  watchdog: renesas_wdt: Add suspend/resume support
  watchdog: f71808e_wdt: Fix WD_EN register read
  watchdog: hpwdt: Update driver version.
  watchdog: hpwdt: Add dynamic debug
  watchdog: hpwdt: Programable Pretimeout NMI
  watchdog: hpwdt: remove allow_kdump module parameter.
  watchdog: hpwdt: condition early return of NMI handler on iLO5
  watchdog: hpwdt: Modify to use watchdog core.
  watchdog: hpwdt: Update nmi_panic message.
  ...
parents 80a17a5f 1991a55d

Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Optional properties: 
  detail please see: Documentation/devicetree/bindings/regmap/regmap.txt.

- fsl,ext-reset-output: If present the watchdog device is configured to

  assert its external reset (WDOG_B) instead of issuing a software reset.

- timeout-sec : Contains the watchdog timeout in seconds



Examples:
@@ -19,4 +20,5 @@ wdt@73f98000 { 
	reg = <0x73f98000 0x4000>;

	interrupts = <58>;

	big-endian;

	timeout-sec = <20>;

};

Documentation/devicetree/bindings/watchdog/meson-wdt.txt

+4 −0
Original line number Diff line number Diff line
@@ -9,9 +9,13 @@ Required properties: 
	"amlogic,meson8m2-wdt" and "amlogic,meson8b-wdt" on Meson8m2 SoCs

- reg : Specifies base physical address and size of the registers.



Optional properties:

- timeout-sec: contains the watchdog timeout in seconds.



Example:



wdt: watchdog@c1109900 {

	compatible = "amlogic,meson6-wdt";

	reg = <0xc1109900 0x8>;

	timeout-sec = <10>;

};

Documentation/devicetree/bindings/watchdog/mtk-wdt.txt

+4 −0
Original line number Diff line number Diff line
@@ -11,9 +11,13 @@ Required properties: 


- reg : Specifies base physical address and size of the registers.



Optional properties:

- timeout-sec: contains the watchdog timeout in seconds.



Example:



wdt: watchdog@10000000 {

	compatible = "mediatek,mt6589-wdt";

	reg = <0x10000000 0x18>;

	timeout-sec = <10>;

};

Documentation/devicetree/bindings/watchdog/nuvoton,npcm-wdt.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
Nuvoton NPCM Watchdog



Nuvoton NPCM timer module provides five 24-bit timer counters, and a watchdog.

The watchdog supports a pre-timeout interrupt that fires 10ms before the

expiry.



Required properties:

- compatible      : "nuvoton,npcm750-wdt" for NPCM750 (Poleg).

- reg             : Offset and length of the register set for the device.

- interrupts      : Contain the timer interrupt with flags for

                    falling edge.



Required clocking property, have to be one of:

- clocks          : phandle of timer reference clock.

- clock-frequency : The frequency in Hz of the clock that drives the NPCM7xx

                    timer (usually 25000000).



Optional properties:

- timeout-sec : Contains the watchdog timeout in seconds



Example:



timer@f000801c {

    compatible = "nuvoton,npcm750-wdt";

    interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;

    reg = <0xf000801c 0x4>;

    clocks = <&clk NPCM7XX_CLK_TIMER>;

};

Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt

+4 −0
Original line number Diff line number Diff line
@@ -5,10 +5,14 @@ Required properties: 
- reg: Address range of tick timer/WDT register set

- interrupts: interrupt number to the cpu



Optional properties:

- timeout-sec : Contains the watchdog timeout in seconds



Example:



timer@b0020000 {

	compatible = "sirf,prima2-tick";

	reg = <0xb0020000 0x1000>;

	interrupts = <0>;

	timeout-sec = <30>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE