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

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

Pull watchdog updates from Wim Van Sebroeck:

 - Add Watchdog Timer driver for RZ/V2H(P)

 - Add Cirrus EP93x

 - Some small fixes and improvements

* tag 'linux-watchdog-6.12-rc1' of git://www.linux-watchdog.org/linux-watchdog:
  watchdog: Convert comma to semicolon
  watchdog: rzv2h_wdt: Add missing MODULE_LICENSE tag to fix modpost error
  dt-bindings: watchdog: Add Cirrus EP93x
  dt-bindings: watchdog: stm32-iwdg: Document interrupt and wakeup properties
  drivers: watchdog: marvell_gti: Convert comma to semicolon
  watchdog: iTCO_wdt: Convert comma to semicolon
  watchdog: Add Watchdog Timer driver for RZ/V2H(P)
  dt-bindings: watchdog: renesas,wdt: Document RZ/V2H(P) SoC
  watchdog: imx_sc_wdt: detect if already running
  watchdog: imx2_wdt: Remove __maybe_unused notations
  watchdog: imx_sc_wdt: Don't disable WDT in suspend
  watchdog: imx7ulp_wdt: move post_rcs_wait into struct imx_wdt_hw_feature
parents 962ad087 134d2531

Documentation/devicetree/bindings/watchdog/cirrus,ep9301-wdt.yaml

0 → 100644
+42 −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/cirrus,ep9301-wdt.yaml#

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



title: Cirrus Logic EP93xx Watchdog Timer



maintainers:

  - Nikita Shubin <nikita.shubin@maquefel.me>

  - Alexander Sverdlin <alexander.sverdlin@gmail.com>



allOf:

  - $ref: watchdog.yaml#



properties:

  compatible:

    oneOf:

      - const: cirrus,ep9301-wdt

      - items:

          - enum:

              - cirrus,ep9302-wdt

              - cirrus,ep9307-wdt

              - cirrus,ep9312-wdt

              - cirrus,ep9315-wdt

          - const: cirrus,ep9301-wdt



  reg:

    maxItems: 1



required:

  - compatible

  - reg



unevaluatedProperties: false



examples:

  - |

    watchdog@80940000 {

        compatible = "cirrus,ep9301-wdt";

        reg = <0x80940000 0x08>;

    };

Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml

+16 −1
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ properties: 
              - renesas,r8a779h0-wdt     # R-Car V4M

          - const: renesas,rcar-gen4-wdt # R-Car Gen4



      - const: renesas,r9a09g057-wdt       # RZ/V2H(P)



  reg:

    maxItems: 1
@@ -113,7 +115,6 @@ properties: 
required:

  - compatible

  - reg

  - interrupts

  - clocks



allOf:
@@ -137,6 +138,7 @@ allOf: 
        compatible:

          contains:

            enum:

              - renesas,r9a09g057-wdt

              - renesas,rzg2l-wdt

              - renesas,rzv2m-wdt

    then:
@@ -171,6 +173,19 @@ allOf: 
        interrupts:

          maxItems: 1



  - if:

      properties:

        compatible:

          contains:

            const: renesas,r9a09g057-wdt

    then:

      properties:

        interrupts: false

        interrupt-names: false

    else:

      required:

        - interrupts



additionalProperties: false



examples:

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

+6 −0
Original line number Diff line number Diff line
@@ -36,6 +36,12 @@ properties: 
    minItems: 1

    maxItems: 2



  interrupts:

    maxItems: 1

    description: Pre-timeout interrupt from the watchdog.



  wakeup-source: true



required:

  - compatible

  - reg

drivers/watchdog/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -953,6 +953,15 @@ config RENESAS_RZG2LWDT 
	  This driver adds watchdog support for the integrated watchdogs in the

	  Renesas RZ/G2L SoCs. These watchdogs can be used to reset a system.



config RENESAS_RZV2HWDT

	tristate "Renesas RZ/V2H(P) WDT Watchdog"

	depends on ARCH_R9A09G057 || COMPILE_TEST

	depends on PM || COMPILE_TEST

	select WATCHDOG_CORE

	help

	  This driver adds watchdog support for the integrated watchdogs in the

	  Renesas RZ/V2H(P) SoCs. These watchdogs can be used to reset a system.



config ASPEED_WATCHDOG

	tristate "Aspeed BMC watchdog support"

	depends on ARCH_ASPEED || COMPILE_TEST

drivers/watchdog/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ obj-$(CONFIG_RENESAS_WDT) += renesas_wdt.o 
obj-$(CONFIG_RENESAS_RZAWDT) += rza_wdt.o

obj-$(CONFIG_RENESAS_RZN1WDT) += rzn1_wdt.o

obj-$(CONFIG_RENESAS_RZG2LWDT) += rzg2l_wdt.o

obj-$(CONFIG_RENESAS_RZV2HWDT) += rzv2h_wdt.o

obj-$(CONFIG_ASPEED_WATCHDOG) += aspeed_wdt.o

obj-$(CONFIG_STM32_WATCHDOG) += stm32_iwdg.o

obj-$(CONFIG_UNIPHIER_WATCHDOG) += uniphier_wdt.o