Commit 0486a39a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull watchdog updates from Wim Van Sebroeck:

 - add new arm_smc_wdt watchdog driver

 - da9062 and da9063 improvements

 - clarify documentation about stop() that became optional

 - document r8a7742 support

 - some overall fixes and improvements

* tag 'linux-watchdog-5.8-rc1' of git://www.linux-watchdog.org/linux-watchdog:
  watchdog: m54xx: Add missing include
  dt-bindings: watchdog: renesas,wdt: Document r8a7742 support
  watchdog: Fix runtime PM imbalance on error
  watchdog: riowd: remove unneeded semicolon
  watchdog: Add new arm_smc_wdt watchdog driver
  dt-bindings: watchdog: Add ARM smc wdt for mt8173 watchdog
  watchdog: imx2_wdt: update contact email
  watchdog: iTCO: fix link error
  watchdog: da9062: No need to ping manually before setting timeout
  watchdog: da9063: Make use of pre-configured timeout during probe
  watchdog: da9062: Initialize timeout during probe
  watchdog: clarify that stop() is optional
  watchdog: imx_sc_wdt: Fix reboot on crash
  watchdog: ts72xx_wdt: fix build error
parents 302d5b33 072cb8b6

Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml

0 → 100644
+37 −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/arm-smc-wdt.yaml#

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



title: ARM Secure Monitor Call based watchdog



allOf:

  - $ref: "watchdog.yaml#"



maintainers:

  - Julius Werner <jwerner@chromium.org>



properties:

  compatible:

    enum:

      - arm,smc-wdt

  arm,smc-id:

    allOf:

      - $ref: /schemas/types.yaml#/definitions/uint32

    description: |

      The ATF smc function id used by the firmware.

      Defaults to 0x82003D06 if unset.



required:

  - compatible



examples:

  - |

    watchdog {

      compatible = "arm,smc-wdt";

      arm,smc-id = <0x82003D06>;

      timeout-sec = <15>;

    };



...

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

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
		fallback compatible string when compatible with the generic

		version.

	       Examples with soctypes are:

		 - "renesas,r8a7742-wdt" (RZ/G1H)

		 - "renesas,r8a7743-wdt" (RZ/G1M)

		 - "renesas,r8a7744-wdt" (RZ/G1N)

		 - "renesas,r8a7745-wdt" (RZ/G1E)

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -1468,6 +1468,13 @@ S: Maintained 
F:	Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt

F:	drivers/irqchip/irq-vic.c













ARM SMC WATCHDOG DRIVER













M:	Julius Werner <jwerner@chromium.org>













R:	Evan Benn <evanbenn@chromium.org>













S:	Maintained













F:	devicetree/bindings/watchdog/arm-smc-wdt.yaml













F:	drivers/watchdog/arm_smc_wdt.c



























ARM SMMU DRIVERS















M:	Will Deacon <will@kernel.org>















R:	Robin Murphy <robin.murphy@arm.com>

































arch/arm64/configs/defconfig



+1
−0






























Original line number
Diff line number
Diff line








@@ -513,6 +513,7 @@ CONFIG_UNIPHIER_THERMAL=y













CONFIG_WATCHDOG=y















CONFIG_ARM_SP805_WATCHDOG=y















CONFIG_ARM_SBSA_WATCHDOG=y













CONFIG_ARM_SMC_WATCHDOG=y















CONFIG_S3C2410_WATCHDOG=y















CONFIG_DW_WATCHDOG=y















CONFIG_SUNXI_WATCHDOG=m

































drivers/watchdog/Kconfig



+14
−0






























Original line number
Diff line number
Diff line








@@ -678,6 +678,7 @@ config TS4800_WATCHDOG













config TS72XX_WATCHDOG















	tristate "TS-72XX SBC Watchdog"















	depends on MACH_TS72XX || COMPILE_TEST













	select WATCHDOG_CORE















	help















	  Technologic Systems TS-7200, TS-7250 and TS-7260 boards have















	  watchdog timer implemented in a external CPLD chip. Say Y here










@@ -867,6 +868,19 @@ config DIGICOLOR_WATCHDOG













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















	  module will be called digicolor_wdt.





























config ARM_SMC_WATCHDOG













	tristate "ARM Secure Monitor Call based watchdog support"













	depends on ARM || ARM64













	depends on OF













	depends on HAVE_ARM_SMCCC













	select WATCHDOG_CORE













	help













	  Say Y here to include support for a watchdog timer













	  implemented by the EL3 Secure Monitor on ARM platforms.













	  Requires firmware support.













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













	  module will be called arm_smc_wdt.





























config LPC18XX_WATCHDOG















	tristate "LPC18xx/43xx Watchdog"















	depends on ARCH_LPC18XX || COMPILE_TEST









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE