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

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

Pull watchdog updates from Wim Van Sebroeck:

 - add Xilinx Versal watchdog

 - support Hygon FCH/SCH (Server Controller Hub)

 - convert GPL notices to SPDX identifiers

 - other improvements

* tag 'linux-watchdog-6.5-rc1' of git://www.linux-watchdog.org/linux-watchdog:
  watchdog: sp5100_tco: support Hygon FCH/SCH (Server Controller Hub)
  dt-bindings: watchdog: restrict node name suffixes
  MAINTAINERS: Add support for Xilinx versal watchdog
  watchdog: xilinx_wwdt: Add Versal window watchdog support
  dt-bindings: watchdog: xlnx,versal-wwdt: Add versal watchdog
  watchdog: ziirave_wdt: Switch i2c driver back to use .probe()
  watchdog: ibmasr: Replace GPL license notice with SPDX identifier
  watchdog: Convert GPL 2.0 notice to SPDX identifier
  watchdog: loongson1_wdt: Add DT support
parents c17414a2 009637de

Documentation/devicetree/bindings/watchdog/xlnx,versal-wwdt.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/watchdog/xlnx,versal-wwdt.yaml#

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



title: Xilinx Versal window watchdog timer controller



maintainers:

  - Neeli Srinivas <srinivas.neeli@amd.com>



description:

  Versal watchdog intellectual property uses window watchdog mode.

  Window watchdog timer(WWDT) contains closed(first) and open(second)

  window with 32 bit width. Write to the watchdog timer within

  predefined window periods of time. This means a period that is not

  too soon and a period that is not too late. The WWDT has to be

  restarted within the open window time. If software tries to restart

  WWDT outside of the open window time period, it generates a reset.



allOf:

  - $ref: watchdog.yaml#



properties:

  compatible:

    enum:

      - xlnx,versal-wwdt



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



required:

  - compatible

  - reg

  - clocks



unevaluatedProperties: false



examples:

  - |

    watchdog@fd4d0000 {

        compatible = "xlnx,versal-wwdt";

        reg = <0xfd4d0000 0x10000>;

        clocks = <&clock25>;

        timeout-sec = <30>;

    };

...

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -23460,8 +23460,10 @@ M: Srinivas Neeli <srinivas.neeli@amd.com> 
R:	Shubhrajyoti Datta <shubhrajyoti.datta@amd.com>

R:	Michal Simek <michal.simek@amd.com>

S:	Maintained

F:	Documentation/devicetree/bindings/watchdog/xlnx,versal-wwdt.yaml

F:	Documentation/devicetree/bindings/watchdog/xlnx,xps-timebase-wdt.yaml

F:	drivers/watchdog/of_xilinx_wdt.c

F:	drivers/watchdog/xilinx_wwdt.c









XILINX XDMA DRIVER









M:	Lizhi Hou <lizhi.hou@amd.com>

























drivers/watchdog/Kconfig



+18
−0






























Original line number
Diff line number
Diff line







@@ -304,6 +304,24 @@ config XILINX_WATCHDOG







	  To compile this driver as a module, choose M here: the









	  module will be called of_xilinx_wdt.



















config XILINX_WINDOW_WATCHDOG









	tristate "Xilinx window watchdog timer"









	depends on HAS_IOMEM









	depends on ARM64









	select WATCHDOG_CORE









	help









	  Window watchdog driver for the versal_wwdt IP core.









	  Window watchdog timer(WWDT) contains closed(first) and









	  open(second) window with 32 bit width. Write to the watchdog









	  timer within predefined window periods of time. This means









	  a period that is not too soon and a period that is not too









	  late. The WWDT has to be restarted within the open window time.









	  If software tries to restart WWDT outside of the open window









	  time period, it generates a reset.



















	  To compile this driver as a module, choose M here: the









	  module will be called xilinx_wwdt.



















config ZIIRAVE_WATCHDOG









	tristate "Zodiac RAVE Watchdog Timer"









	depends on I2C
































drivers/watchdog/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -157,6 +157,7 @@ obj-$(CONFIG_M54xx_WATCHDOG) += m54xx_wdt.o

















# MicroBlaze Architecture









obj-$(CONFIG_XILINX_WATCHDOG) += of_xilinx_wdt.o









obj-$(CONFIG_XILINX_WINDOW_WATCHDOG) += xilinx_wwdt.o



















# MIPS Architecture









obj-$(CONFIG_ATH79_WDT) += ath79_wdt.o
































drivers/watchdog/ep93xx_wdt.c



+1
−4






























Original line number
Diff line number
Diff line









// SPDX-License-Identifier: GPL-2.0-only









/*









 * Watchdog driver for Cirrus Logic EP93xx family of devices.









 *








@@ -11,10 +12,6 @@







 * Copyright (c) 2012 H Hartley Sweeten <hsweeten@visionengravers.com>









 *	Convert to a platform device and use the watchdog framework API









 *









 * This file is licensed under the terms of the GNU General Public









 * License version 2. This program is licensed "as is" without any









 * warranty of any kind, whether express or implied.









 *









 * This watchdog fires after 250msec, which is a too short interval









 * for us to rely on the user space daemon alone. So we ping the









 * wdt each ~200msec and eventually stop doing it if the user space