Commit 696c45bc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull watchdog updates from Wim Van Sebroeck:

 - Add watchdog driver for Lenovo SE30 platform

 - Add support for Allwinner A523

 - Add i.MX94 support

 - watchdog framework: Convert to use device property

 - renesas,wdt: Document RZ/G3E support

 - Various other fixes and improvemenents

* tag 'linux-watchdog-6.15-rc1' of git://www.linux-watchdog.org/linux-watchdog:
  watchdog: sunxi_wdt: Add support for Allwinner A523
  dt-bindings: watchdog: sunxi: add Allwinner A523 compatible string
  watchdog: aspeed: fix 64-bit division
  watchdog: npcm: Remove unnecessary NULL check before clk_prepare_enable/clk_disable_unprepare
  dt-bindings: watchdog: renesas,wdt: Document RZ/G3E support
  watchdog: Convert to use device property
  watchdog: lenovo_se30_wdt: include io.h for devm_ioremap()
  dt-bindings: watchdog: fsl-imx7ulp-wdt: Add i.MX94 support
  watchdog: nic7018_wdt: tidy up ACPI ID table
  watchdog: s3c2410_wdt: Fix PMU register bits for ExynosAutoV920 SoC
  watchdog: lenovo_se30_wdt: Watchdog driver for Lenovo SE30 platform
  watchdog: Enable RZV2HWDT driver depend on ARCH_RENESAS
  watchdog: cros-ec: Add newlines to printks
  watchdog: aspeed: Update bootstatus handling
parents 28a1b056 9bc64d33

Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ properties: 
      - items:

          - const: allwinner,sun20i-d1-wdt-reset

          - const: allwinner,sun20i-d1-wdt

      - const: allwinner,sun55i-a523-wdt



  reg:

    maxItems: 1
@@ -60,6 +61,7 @@ if: 
          - allwinner,sun20i-d1-wdt-reset

          - allwinner,sun50i-r329-wdt

          - allwinner,sun50i-r329-wdt-reset

          - allwinner,sun55i-a523-wdt



then:

  properties:

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

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ properties: 
          - const: fsl,imx8ulp-wdt

          - const: fsl,imx7ulp-wdt

      - const: fsl,imx93-wdt

      - items:

          - enum:

              - fsl,imx94-wdt

          - const: fsl,imx93-wdt



  reg:

    maxItems: 1

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

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ properties: 
              - renesas,r8a779h0-wdt     # R-Car V4M

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



      - items:

          - const: renesas,r9a09g047-wdt # RZ/G3E

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



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



  reg:

drivers/watchdog/Kconfig

+18 −4
Original line number Diff line number Diff line
@@ -279,6 +279,18 @@ config LENOVO_SE10_WDT 
	  This driver can also be built as a module. If so, the module

	  will be called lenovo-se10-wdt.



config LENOVO_SE30_WDT

	tristate "Lenovo SE30 Watchdog"

	depends on (X86 && DMI) || COMPILE_TEST

	depends on HAS_IOPORT

	select WATCHDOG_CORE

	help

	  If you say yes here you get support for the watchdog

	  functionality for the Lenovo SE30 platform.



	  This driver can also be built as a module. If so, the module

	  will be called lenovo-se30-wdt.



config MENF21BMC_WATCHDOG

	tristate "MEN 14F021P00 BMC Watchdog"

	depends on MFD_MENF21BMC || COMPILE_TEST
@@ -963,13 +975,14 @@ config RENESAS_RZG2LWDT 
	  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

	tristate "Renesas RZ/{G3E,V2H(P)} WDT Watchdog"

	depends on ARCH_RENESAS || 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.

	  Renesas RZ/{G3E,V2H(P)} SoCs. These watchdogs can be used to reset a

	  system.



config ASPEED_WATCHDOG

	tristate "Aspeed BMC watchdog support"
@@ -1730,7 +1743,8 @@ config NI903X_WDT 


config NIC7018_WDT

	tristate "NIC7018 Watchdog"

	depends on X86 && ACPI

	depends on HAS_IOPORT

	depends on ACPI || COMPILE_TEST

	select WATCHDOG_CORE

	help

	  Support for National Instruments NIC7018 Watchdog.

drivers/watchdog/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ obj-$(CONFIG_I6300ESB_WDT) += i6300esb.o 
obj-$(CONFIG_IE6XX_WDT) += ie6xx_wdt.o

obj-$(CONFIG_ITCO_WDT) += iTCO_wdt.o

obj-$(CONFIG_LENOVO_SE10_WDT) += lenovo_se10_wdt.o

obj-$(CONFIG_LENOVO_SE30_WDT) += lenovo_se30_wdt.o

ifeq ($(CONFIG_ITCO_VENDOR_SUPPORT),y)

obj-$(CONFIG_ITCO_WDT) += iTCO_vendor_support.o

endif