Commit d77e9e4e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull watchdog updates from Wim Van Sebroeck:

 - add Allwinner H6 watchdog

 - drop warning after registering device patches

 - hpwdt improvements

 - gpio: add support for nowayout option

 - introduce CONFIG_WATCHDOG_OPEN_TIMEOUT

 - convert remaining drivers to use SPDX license identifier

 - Fixes and improvements on several watchdog device drivers

* tag 'linux-watchdog-5.3-rc1' of git://www.linux-watchdog.org/linux-watchdog: (74 commits)
  watchdog: digicolor_wdt: Remove unused variable in dc_wdt_probe
  watchdog: ie6xx_wdt: Use spinlock_t instead of struct spinlock
  watchdog: atmel: atmel-sama5d4-wdt: Disable watchdog on system suspend
  watchdog: convert remaining drivers to use SPDX license identifier
  dt-bindings: watchdog: Rename bindings documentation file
  watchdog: mei_wdt: no need to check return value of debugfs_create functions
  watchdog: bcm_kona_wdt: no need to check return value of debugfs_create functions
  docs: watchdog: Fix build error.
  docs: watchdog: convert docs to ReST and rename to *.rst
  watchdog: make the device time out at open_deadline when open_timeout is used
  watchdog: introduce CONFIG_WATCHDOG_OPEN_TIMEOUT
  watchdog: introduce watchdog.open_timeout commandline parameter
  dt-bindings: watchdog: move i.MX system controller watchdog binding to SCU
  watchdog: imx_sc: Add pretimeout support
  watchdog: renesas_wdt: Add a few cycles delay
  watchdog: gpio: add support for nowayout option
  watchdog: renesas_wdt: Use 'dev' instead of dereferencing it repeatedly
  dt-bindings: watchdog: add Allwinner H6 watchdog
  watchdog: jz4740: Avoid starting watchdog in set_timeout
  watchdog: jz4740: Use register names from <linux/mfd/ingenic-tcu.h>
  ...
parents 2ae048e1 7fb832ae

Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt

+15 −0
Original line number Diff line number Diff line
@@ -145,6 +145,16 @@ Optional Child nodes: 
- Data cells of ocotp:

  Detailed bindings are described in bindings/nvmem/nvmem.txt



Watchdog bindings based on SCU Message Protocol

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



Required properties:

- compatible: should be:

              "fsl,imx8qxp-sc-wdt"

              followed by "fsl,imx-sc-wdt";

Optional properties:

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



Example (imx8qxp):

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

aliases {
@@ -207,6 +217,11 @@ firmware { 
		rtc: rtc {

			compatible = "fsl,imx8qxp-sc-rtc";

		};



		watchdog {

			compatible = "fsl,imx8qxp-sc-wdt", "fsl,imx-sc-wdt";

			timeout-sec = <60>;

		};

	};

};

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

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
* Freescale i.MX System Controller Watchdog



i.MX system controller watchdog is for i.MX SoCs with system controller inside,

the watchdog is managed by system controller, users can ONLY communicate with

system controller from secure mode for watchdog operations, so Linux i.MX system

controller watchdog driver will call ARM SMC API and trap into ARM-Trusted-Firmware

for watchdog operations, ARM-Trusted-Firmware is running at secure EL3 mode and

it will request system controller to execute the watchdog operation passed from

Linux kernel.



Required properties:

- compatible:	Should be :

		"fsl,imx8qxp-sc-wdt"

		followed by "fsl,imx-sc-wdt";



Optional properties:

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



Examples:



watchdog {

	compatible = "fsl,imx8qxp-sc-wdt", "fsl,imx-sc-wdt";

	timeout-sec = <60>;

};

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

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Required properties: 
	"allwinner,sun4i-a10-wdt"

	"allwinner,sun6i-a31-wdt"

	"allwinner,sun50i-a64-wdt","allwinner,sun6i-a31-wdt"

	"allwinner,sun50i-h6-wdt","allwinner,sun6i-a31-wdt"

	"allwinner,suniv-f1c100s-wdt", "allwinner,sun4i-a10-wdt"

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

Documentation/watchdog/hpwdt.rst

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ Last reviewed: 08/20/2018 
               Default value is set when compiling the kernel. If it is set

               to "Y", then there is no way of disabling the watchdog once

               it has been started.

 kdumptimeout  Minimum timeout in seconds to apply upon receipt of an NMI

               before calling panic. (-1) disables the watchdog.  When value

               is > 0, the timer is reprogrammed with the greater of

               value or current timeout value.

 ============  ================================================================



 NOTE:

CRA Git | Maintained and supported by SUSTech CRA and CCSE