Commit 877d94c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull watchdog updates from Wim Van Sebroeck:

 - sbsa: Adjust keepalive timeout to avoid MediaTek WS0 race condition

 - Various improvements and fixes

* tag 'linux-watchdog-6.17-rc1' of git://www.linux-watchdog.org/linux-watchdog:
  watchdog: sbsa: Adjust keepalive timeout to avoid MediaTek WS0 race condition
  watchdog: dw_wdt: Fix default timeout
  watchdog: Don't use "proxy" headers
  watchdog: it87_wdt: Don't use "proxy" headers
  watchdog: renesas_wdt: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
  watchdog: iTCO_wdt: Report error if timeout configuration fails
  watchdog: rti_wdt: Use of_reserved_mem_region_to_resource() for "memory-region"
  dt-bindings: watchdog: nxp,pnx4008-wdt: allow clocks property
  watchdog: ziirave_wdt: check record length in ziirave_firm_verify()
parents 196dacf4 48defdf6

Documentation/devicetree/bindings/watchdog/nxp,pnx4008-wdt.yaml

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ properties: 
  reg:

    maxItems: 1



  clocks:

    maxItems: 1



required:

  - compatible

  - reg

drivers/watchdog/dw_wdt.c

+2 −0
Original line number Diff line number Diff line
@@ -644,6 +644,8 @@ static int dw_wdt_drv_probe(struct platform_device *pdev) 
	} else {

		wdd->timeout = DW_WDT_DEFAULT_SECONDS;

		watchdog_init_timeout(wdd, 0, dev);

		/* Limit timeout value to hardware constraints. */

		dw_wdt_set_timeout(wdd, wdd->timeout);

	}



	platform_set_drvdata(pdev, dw_wdt);

drivers/watchdog/iTCO_wdt.c

+5 −1
Original line number Diff line number Diff line
@@ -577,7 +577,11 @@ static int iTCO_wdt_probe(struct platform_device *pdev) 
	/* Check that the heartbeat value is within it's range;

	   if not reset to the default */

	if (iTCO_wdt_set_timeout(&p->wddev, heartbeat)) {

		iTCO_wdt_set_timeout(&p->wddev, WATCHDOG_TIMEOUT);

		ret = iTCO_wdt_set_timeout(&p->wddev, WATCHDOG_TIMEOUT);

		if (ret != 0) {

			dev_err(dev, "Failed to set watchdog timeout (%d)\n", WATCHDOG_TIMEOUT);

			return ret;

		}

		dev_info(dev, "timeout value out of range, using %d\n",

			WATCHDOG_TIMEOUT);

		heartbeat = WATCHDOG_TIMEOUT;

drivers/watchdog/it87_wdt.c

+3 −1
Original line number Diff line number Diff line
@@ -22,11 +22,13 @@ 


#include <linux/bits.h>

#include <linux/dmi.h>

#include <linux/errno.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/kernel.h>

#include <linux/ioport.h>

#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/printk.h>

#include <linux/types.h>

#include <linux/watchdog.h>

drivers/watchdog/renesas_wdt.c

+4 −4
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static void rwdt_remove(struct platform_device *pdev) 
	pm_runtime_disable(&pdev->dev);

}



static int __maybe_unused rwdt_suspend(struct device *dev)

static int rwdt_suspend(struct device *dev)

{

	struct rwdt_priv *priv = dev_get_drvdata(dev);
@@ -310,7 +310,7 @@ static int __maybe_unused rwdt_suspend(struct device *dev) 
	return 0;

}



static int __maybe_unused rwdt_resume(struct device *dev)

static int rwdt_resume(struct device *dev)

{

	struct rwdt_priv *priv = dev_get_drvdata(dev);
@@ -320,7 +320,7 @@ static int __maybe_unused rwdt_resume(struct device *dev) 
	return 0;

}



static SIMPLE_DEV_PM_OPS(rwdt_pm_ops, rwdt_suspend, rwdt_resume);

static DEFINE_SIMPLE_DEV_PM_OPS(rwdt_pm_ops, rwdt_suspend, rwdt_resume);



static const struct of_device_id rwdt_ids[] = {

	{ .compatible = "renesas,rcar-gen2-wdt", },
@@ -334,7 +334,7 @@ static struct platform_driver rwdt_driver = { 
	.driver = {

		.name = "renesas_wdt",

		.of_match_table = rwdt_ids,

		.pm = &rwdt_pm_ops,

		.pm = pm_sleep_ptr(&rwdt_pm_ops),

	},

	.probe = rwdt_probe,

	.remove = rwdt_remove,