Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07d306c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://www.linux-watchdog.org/linux-watchdog 

Pull watchdog updates from Wim Van Sebroeck:

 - Add Renesas RZ/A WDT Watchdog driver

 - STM32 Independent WatchDoG (IWDG) support

 - UniPhier watchdog support

 - Add F71868 support

 - Add support for NCT6793D and NCT6795D

 - dw_wdt: add reset lines support

 - core: add option to avoid early handling of watchdog

 - core: introduce watchdog_worker_should_ping helper

 - Cleanups and improvements for sama5d4, intel-mid_wdt, s3c2410_wdt,
   orion_wdt, gpio_wdt, it87_wdt, meson_wdt, davinci_wdt, bcm47xx_wdt,
   zx2967_wdt, cadence_wdt

* git://www.linux-watchdog.org/linux-watchdog: (32 commits)
  watchdog: introduce watchdog_worker_should_ping helper
  watchdog: uniphier: add UniPhier watchdog driver
  dt-bindings: watchdog: add description for UniPhier WDT controller
  watchdog: cadence_wdt: make of_device_ids const.
  watchdog: zx2967: constify zx2967_wdt_ops.
  watchdog: bcm47xx_wdt: constify bcm47xx_wdt_hard_ops and bcm47xx_wdt_soft_ops
  watchdog: davinci: Add missing clk_disable_unprepare().
  watchdog: davinci: Handle return value of clk_prepare_enable
  watchdog: meson: Handle return value of clk_prepare_enable
  watchdog: it87: Add support for various Super-IO chips
  watchdog: it87: Use infrastructure to stop watchdog on reboot
  watchdog: it87: Drop support for resetting watchdog though CIR and Game port
  watchdog: it87: Convert to use watchdog core infrastructure
  watchdog: it87: Drop FSF mailing address
  watchdog: dw_wdt: get reset lines from dt
  watchdog: bindings: dw_wdt: add reset lines
  watchdog: w83627hf: Add support for NCT6793D and NCT6795D
  watchdog: core: add option to avoid early handling of watchdog
  watchdog: f71808e_wdt: Add F71868 support
  watchdog: Add STM32 IWDG driver
  ...
parents a3ddacba c013b65a

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

0 → 100644
+23 −0
Original line number Diff line number Diff line 
* Dialog Semiconductor DA9062/61 Watchdog Timer



Required properties:



- compatible: should be one of the following valid compatible string lines:

	"dlg,da9061-watchdog", "dlg,da9062-watchdog"

	"dlg,da9062-watchdog"



Example: DA9062



	pmic0: da9062@58 {

		watchdog {

			compatible = "dlg,da9062-watchdog";

		};

	};



Example: DA9061 using a fall-back compatible for the DA9062 watchdog driver



	pmic0: da9061@58 {

		watchdog {

			compatible = "dlg,da9061-watchdog", "dlg,da9062-watchdog";

		};

	};

Documentation/devicetree/bindings/watchdog/dw_wdt.txt

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ Required Properties: 
Optional Properties:



- interrupts	: The interrupt used for the watchdog timeout warning.

- resets	: phandle pointing to the system reset controller with

		line index for the watchdog.



Example:
@@ -18,4 +20,5 @@ Example: 
		reg = <0xffd02000 0x1000>;

		interrupts = <0 171 4>;

		clocks = <&per_base_clk>;

		resets = <&rst WDT0_RESET>;

	};

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

+3 −1
Original line number Diff line number Diff line
@@ -2,10 +2,11 @@ Renesas Watchdog Timer (WDT) Controller 


Required properties:

- compatible : Should be "renesas,<soctype>-wdt", and

	       "renesas,rcar-gen3-wdt" as fallback.

	       "renesas,rcar-gen3-wdt" or "renesas,rza-wdt" as fallback.

	       Examples with soctypes are:

	         - "renesas,r8a7795-wdt" (R-Car H3)

	         - "renesas,r8a7796-wdt" (R-Car M3-W)

	         - "renesas,r7s72100-wdt" (RZ/A1)



  When compatible with the generic version, nodes must list the SoC-specific

  version corresponding to the platform first, followed by the generic
@@ -17,6 +18,7 @@ Required properties: 
Optional properties:

- timeout-sec : Contains the watchdog timeout in seconds

- power-domains : the power domain the WDT belongs to

- interrupts: Some WDTs have an interrupt when used in interval timer mode



Examples:

Documentation/devicetree/bindings/watchdog/st,stm32-iwdg.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
STM32 Independent WatchDoG (IWDG)

---------------------------------



Required properties:

- compatible: "st,stm32-iwdg"

- reg: physical base address and length of the registers set for the device

- clocks: must contain a single entry describing the clock input



Optional Properties:

- timeout-sec: Watchdog timeout value in seconds.



Example:



iwdg: watchdog@40003000 {

	compatible = "st,stm32-iwdg";

	reg = <0x40003000 0x400>;

	clocks = <&clk_lsi>;

	timeout-sec = <32>;

};

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

0 → 100644
+20 −0
Original line number Diff line number Diff line 
UniPhier watchdog timer controller



This UniPhier watchdog timer controller must be under sysctrl node.



Required properties:

- compatible: should be "socionext,uniphier-wdt"



Example:



	sysctrl@61840000 {

		compatible = "socionext,uniphier-ld11-sysctrl",

			     "simple-mfd", "syscon";

		reg = <0x61840000 0x4000>;



		watchdog {

			compatible = "socionext,uniphier-wdt";

		}



		other nodes ...

	};