Commit 96752be4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull watchdog updates from Wim Van Sebroeck:

 - Add MediaTek MT8186 support

 - Add Mediatek MT7986 reset-controller support

 - Add i.MX93 support

 - Add watchdog driver for Sunplus SP7021

 - Add SC8180X and SC8280XP compatibles

 - Add Renesas RZ/N1 Watchdog driver and support for RZ/N1

 - rzg2l_wdt improvements and fixes

 - Several other improvements and fixes

* tag 'linux-watchdog-5.19-rc1' of git://www.linux-watchdog.org/linux-watchdog: (38 commits)
  watchdog: ts4800_wdt: Fix refcount leak in ts4800_wdt_probe
  dt-bindings: watchdog: renesas,wdt: R-Car V3U is R-Car Gen4
  watchdog: Add Renesas RZ/N1 Watchdog driver
  dt-bindings: watchdog: renesas,wdt: Add support for RZ/N1
  watchdog: wdat_wdt: Stop watchdog when uninstalling module
  watchdog: wdat_wdt: Stop watchdog when rebooting the system
  watchdog: wdat_wdt: Using the existing function to check parameter timeout
  dt-bindings: watchdog: da9062: add watchdog timeout mode
  dt-bindings: watchdog: renesas,wdt: Document RZ/G2UL SoC
  watchdog: iTCO_wdt: Using existing macro define covers more scenarios
  watchdog: rti-wdt: Fix pm_runtime_get_sync() error checking
  dt-bindings: watchdog: Add SC8180X and SC8280XP compatibles
  watchdog: rti_wdt: Fix calculation and evaluation of preset heartbeat
  dt-bindings: watchdog: uniphier: Use unevaluatedProperties
  watchdog: sp805: disable watchdog on remove
  watchdog: da9063: optionally disable watchdog during suspend
  dt-bindings: mfd: da9063: watchdog: add suspend disable option
  dt-bindings: watchdog: sunxi: clarify clock support
  dt-bindings: watchdog: sunxi: fix F1C100s compatible
  watchdog: Add watchdog driver for Sunplus SP7021
  ...
parents 17688215 5d24df3d

Documentation/devicetree/bindings/mfd/da9063.txt

+6 −3
Original line number Diff line number Diff line
@@ -64,10 +64,13 @@ Sub-nodes: 
    and KEY_SLEEP.



- watchdog : This node defines settings for the Watchdog timer associated

  with the DA9063 and DA9063L. There are currently no entries in this

  binding, however compatible = "dlg,da9063-watchdog" should be added

  if a node is created.

  with the DA9063 and DA9063L. The node should contain the compatible property

  with the value "dlg,da9063-watchdog".



  Optional watchdog properties:

  - dlg,use-sw-pm: Add this property to disable the watchdog during suspend.

  Only use this option if you can't use the watchdog automatic suspend

  function during a suspend (see register CONTROL_B).



Example:

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

+6 −0
Original line number Diff line number Diff line
@@ -10,6 +10,12 @@ Optional properties: 
- dlg,use-sw-pm: Add this property to disable the watchdog during suspend.

	Only use this option if you can't use the watchdog automatic suspend

	function during a suspend (see register CONTROL_B).

- dlg,wdt-sd: Set what happens on watchdog timeout. If this bit is set the

	watchdog timeout triggers SHUTDOWN, if cleared the watchdog triggers

	POWERDOWN. Can be 0 or 1. Only use this option if you want to change the

	default chip's OTP setting for WATCHDOG_SD bit. If this property is NOT

	set the WATCHDOG_SD bit and on timeout watchdog behavior will match the

	chip's OTP settings.



Example: DA9062

Documentation/devicetree/bindings/watchdog/faraday,ftwdt010.txt

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
Faraday Technology FTWDT010 watchdog



This is an IP part from Faraday Technology found in the Gemini

SoCs and others.



Required properties:

- compatible : must be one of

  "faraday,ftwdt010"

  "cortina,gemini-watchdog", "faraday,ftwdt010"

- reg : shall contain base register location and length

- interrupts : shall contain the interrupt for the watchdog



Optional properties:

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



Example:



watchdog@41000000 {

	compatible = "faraday,ftwdt010";

	reg = <0x41000000 0x1000>;

	interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;

};

Documentation/devicetree/bindings/watchdog/faraday,ftwdt010.yaml

0 → 100644
+67 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/watchdog/faraday,ftwdt010.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Faraday Technology FTWDT010 watchdog



maintainers:

  - Linus Walleij <linus.walleij@linaro.org>

  - Corentin Labbe <clabbe@baylibre.com>



description: |

  This is an IP part from Faraday Technology found in the Gemini

  SoCs and others.



allOf:

  - $ref: "watchdog.yaml#"



properties:

  compatible:

    oneOf:

      - const: faraday,ftwdt010

      - items:

          - enum:

              - cortina,gemini-watchdog

              - moxa,moxart-watchdog

          - const: faraday,ftwdt010



  reg:

    maxItems: 1



  resets:

    maxItems: 1



  clocks:

    maxItems: 1



  clock-names:

    const: PCLK



  interrupts:

    maxItems: 1



required:

  - compatible

  - reg



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/irq.h>

    watchdog@41000000 {

      compatible = "faraday,ftwdt010";

      reg = <0x41000000 0x1000>;

      interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;

      timeout-secs = <5>;

    };

  - |

    watchdog: watchdog@98500000 {

      compatible = "moxa,moxart-watchdog", "faraday,ftwdt010";

      reg = <0x98500000 0x10>;

      clocks = <&clk_apb>;

      clock-names = "PCLK";

    };

...

Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.yaml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ properties: 
      - items:

          - const: fsl,imx8ulp-wdt

          - const: fsl,imx7ulp-wdt

      - const: fsl,imx93-wdt



  reg:

    maxItems: 1