Commit 4c00e1e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull watchdog updates from Wim Van Sebroeck:

 - add Mediatek MT7986 & MT8195 wdt support

 - add Maxim MAX63xx

 - drop bd70528 support

 - rewrite ixp4xx to watchdog framework

 - constify static struct watchdog_ops for sl28cpld_wdt, mpc8xxx_wdt and
   tqmx86

 - introduce watchdog_dev_suspend/resume

 - several fixes and improvements

* tag 'linux-watchdog-5.15-rc1' of git://www.linux-watchdog.org/linux-watchdog:
  dt-bindings: watchdog: Add compatible for Mediatek MT7986
  watchdog: ixp4xx: Rewrite driver to use core
  watchdog: Start watchdog in watchdog_set_last_hw_keepalive only if appropriate
  watchdog: max63xx_wdt: Add device tree probing
  dt-bindings: watchdog: Add Maxim MAX63xx bindings
  watchdog: mediatek: mt8195: add wdt support
  dt-bindings: reset: mt8195: add toprgu reset-controller header file
  watchdog: tqmx86: Constify static struct watchdog_ops
  watchdog: mpc8xxx_wdt: Constify static struct watchdog_ops
  watchdog: sl28cpld_wdt: Constify static struct watchdog_ops
  watchdog: iTCO_wdt: Fix detection of SMI-off case
  watchdog: bcm2835_wdt: consider system-power-controller property
  watchdog: imx2_wdg: notify wdog core to stop ping worker on suspend
  watchdog: introduce watchdog_dev_suspend/resume
  watchdog: Fix NULL pointer dereference when releasing cdev
  watchdog: only run driver set_pretimeout op if device supports it
  watchdog: bd70528 drop bd70528 support
parents 192ad3c2 41e73feb

Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml

0 → 100644
+44 −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/maxim,max63xx.yaml#

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



title: Maxim 63xx Watchdog Timers



allOf:

  - $ref: "watchdog.yaml#"



maintainers:

  - Marc Zyngier <maz@kernel.org>

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



properties:

  compatible:

    oneOf:

      - const: maxim,max6369

      - const: maxim,max6370

      - const: maxim,max6371

      - const: maxim,max6372

      - const: maxim,max6373

      - const: maxim,max6374



  reg:

    description: This is a 1-byte memory-mapped address

    maxItems: 1



required:

  - compatible

  - reg



unevaluatedProperties: false



examples:

  - |

    wdt: watchdog@50000000 {

        compatible = "maxim,max6369";

        reg = <0x50000000 0x1>;

        timeout-sec = <10>;

    };



...

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

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Required properties: 
	"mediatek,mt7622-wdt", "mediatek,mt6589-wdt": for MT7622

	"mediatek,mt7623-wdt", "mediatek,mt6589-wdt": for MT7623

	"mediatek,mt7629-wdt", "mediatek,mt6589-wdt": for MT7629

	"mediatek,mt7986-wdt", "mediatek,mt6589-wdt": for MT7986

	"mediatek,mt8183-wdt": for MT8183

	"mediatek,mt8516-wdt", "mediatek,mt6589-wdt": for MT8516

	"mediatek,mt8192-wdt": for MT8192

drivers/watchdog/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -168,18 +168,6 @@ config SOFT_WATCHDOG_PRETIMEOUT 
	  watchdog. Be aware that governors might affect the watchdog because it

	  is purely software, e.g. the panic governor will stall it!



config BD70528_WATCHDOG

	tristate "ROHM BD70528 PMIC Watchdog"

	depends on MFD_ROHM_BD70528

	select WATCHDOG_CORE

	help

	  Support for the watchdog in the ROHM BD70528 PMIC. Watchdog trigger

	  cause system reset.



	  Say Y here to include support for the ROHM BD70528 watchdog.

	  Alternatively say M to compile the driver as a module,

	  which will be called bd70528_wdt.



config BD957XMUF_WATCHDOG

	tristate "ROHM BD9576MUF and BD9573MUF PMIC Watchdog"

	depends on MFD_ROHM_BD957XMUF

drivers/watchdog/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ obj-$(CONFIG_WATCHDOG_SUN4V) += sun4v_wdt.o 
obj-$(CONFIG_XEN_WDT) += xen_wdt.o



# Architecture Independent

obj-$(CONFIG_BD70528_WATCHDOG) += bd70528_wdt.o

obj-$(CONFIG_BD957XMUF_WATCHDOG) += bd9576_wdt.o

obj-$(CONFIG_DA9052_WATCHDOG) += da9052_wdt.o

obj-$(CONFIG_DA9055_WATCHDOG) += da9055_wdt.o

drivers/watchdog/bcm2835_wdt.c

+7 −3
Original line number Diff line number Diff line
@@ -205,9 +205,13 @@ static int bcm2835_wdt_probe(struct platform_device *pdev) 
	if (err)

		return err;



	if (pm_power_off == NULL) {

	if (of_device_is_system_power_controller(pdev->dev.parent->of_node)) {

		if (!pm_power_off) {

			pm_power_off = bcm2835_power_off;

			bcm2835_power_off_wdt = wdt;

		} else {

			dev_info(dev, "Poweroff handler already present!\n");

		}

	}



	dev_info(dev, "Broadcom BCM2835 watchdog timer");