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

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

Pull watchdog updates from Wim Van Sebroeck:

 - add RTL9310 support

 - sp805_wdt: add arm cmsdk apb wdt support

 - Remove #ifdef guards for PM related functions for several watchdog
   device drivers

 - pm8916_wdt reboot improvements

 - Several other fixes and improvements

* tag 'linux-watchdog-5.20-rc1' of git://www.linux-watchdog.org/linux-watchdog: (24 commits)
  watchdog: armada_37xx_wdt: check the return value of devm_ioremap() in armada_37xx_wdt_probe()
  watchdog: dw_wdt: Fix comment typo
  watchdog: Fix comment typo
  dt-bindings: watchdog: Add fsl,scu-wdt yaml file
  watchdog:Fix typo in comment
  watchdog: pm8916_wdt: Handle watchdog enabled by bootloader
  watchdog: pm8916_wdt: Report reboot reason
  watchdog: pm8916_wdt: Avoid read of write-only PET register
  watchdog: wdat_wdt: Remove #ifdef guards for PM related functions
  watchdog: tegra_wdt: Remove #ifdef guards for PM related functions
  watchdog: st_lpc_wdt: Remove #ifdef guards for PM related functions
  watchdog: sama5d4_wdt: Remove #ifdef guards for PM related functions
  watchdog: s3c2410_wdt: Remove #ifdef guards for PM related functions
  watchdog: mtk_wdt: Remove #ifdef guards for PM related functions
  watchdog: dw_wdt: Remove #ifdef guards for PM related functions
  watchdog: bcm7038_wdt: Remove #ifdef guards for PM related functions
  watchdog: realtek-otto: add RTL9310 support
  dt-bindings: watchdog: realtek,otto-wdt: add RTL9310
  watchdog: sp805_wdt: add arm cmsdk apb wdt support
  watchdog: sp5100_tco: Fix a memory leak of EFCH MMIO resource
  ...
parents 507f811f 2d27e528

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ properties: 
              - qcom,apss-wdt-sc8280xp

              - qcom,apss-wdt-sdm845

              - qcom,apss-wdt-sdx55

              - qcom,apss-wdt-sdx65

              - qcom,apss-wdt-sm6350

              - qcom,apss-wdt-sm8150

              - qcom,apss-wdt-sm8250

Documentation/devicetree/bindings/watchdog/realtek,otto-wdt.yaml

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ properties: 
      - realtek,rtl8380-wdt

      - realtek,rtl8390-wdt

      - realtek,rtl9300-wdt

      - realtek,rtl9310-wdt



  reg:

    maxItems: 1

drivers/watchdog/armada_37xx_wdt.c

+2 −0
Original line number Diff line number Diff line
@@ -274,6 +274,8 @@ static int armada_37xx_wdt_probe(struct platform_device *pdev) 
	if (!res)

		return -ENODEV;

	dev->reg = devm_ioremap(&pdev->dev, res->start, resource_size(res));

	if (!dev->reg)

		return -ENOMEM;



	/* init clock */

	dev->clk = devm_clk_get(&pdev->dev, NULL);

drivers/watchdog/bcm7038_wdt.c

+3 −5
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ static int bcm7038_wdt_probe(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int bcm7038_wdt_suspend(struct device *dev)

{

	struct bcm7038_watchdog *wdt = dev_get_drvdata(dev);
@@ -212,10 +211,9 @@ static int bcm7038_wdt_resume(struct device *dev) 


	return 0;

}

#endif



static SIMPLE_DEV_PM_OPS(bcm7038_wdt_pm_ops, bcm7038_wdt_suspend,

			 bcm7038_wdt_resume);

static DEFINE_SIMPLE_DEV_PM_OPS(bcm7038_wdt_pm_ops,

				bcm7038_wdt_suspend, bcm7038_wdt_resume);



static const struct of_device_id bcm7038_wdt_match[] = {

	{ .compatible = "brcm,bcm6345-wdt" },
@@ -236,7 +234,7 @@ static struct platform_driver bcm7038_wdt_driver = { 
	.driver		= {

		.name		= "bcm7038-wdt",

		.of_match_table	= bcm7038_wdt_match,

		.pm		= &bcm7038_wdt_pm_ops,

		.pm		= pm_sleep_ptr(&bcm7038_wdt_pm_ops),

	}

};

module_platform_driver(bcm7038_wdt_driver);

drivers/watchdog/booke_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static unsigned long long period_to_sec(unsigned int period) 
/*

 * This procedure will find the highest period which will give a timeout

 * greater than the one required. e.g. for a bus speed of 66666666 and

 * and a parameter of 2 secs, then this procedure will return a value of 38.

 * a parameter of 2 secs, then this procedure will return a value of 38.

 */

static unsigned int sec_to_period(unsigned int secs)

{