Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27acbec3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://www.linux-watchdog.org/linux-watchdog 

Pull watchdog updates from Wim Van Sebroeck:
 "Core:
   - min and max timeout improvements, WDOG_HW_RUNNING improvements,
     status funtionality
   - Add a device managed API for watchdog_register_device()

  New watchdog drivers:
   -  Aspeed SoCs
   -  Maxim PMIC MAX77620
   -  Amlogic Meson GXBB SoC

  Enhancements:
   - support for the r8a7796 watchdog device
   - support for F81866 watchdog device
   - support for 5th variation of Apollo Lake
   - support for MCP78S chipset
   - clean-up of softdog.c watchdog device driver
   - pic32-wdt and pic32-dmt fixes
   - Documentation/watchdog: watchdog-test improvements
   - several other fixes and improvements"

* git://www.linux-watchdog.org/linux-watchdog: (50 commits)
  watchdog: gpio_wdt: Fix missing platform_set_drvdata() in gpio_wdt_probe()
  watchdog: core: Clear WDOG_HW_RUNNING before calling the stop function
  watchdog: core: Fix error handling of watchdog_dev_init()
  watchdog: pic32-wdt: Fix return value check in pic32_wdt_drv_probe()
  watchdog: pic32-dmt: Remove .owner field for driver
  watchdog: pic32-wdt: Remove .owner field for driver
  watchdog: renesas-wdt: Add support for the r8a7796 wdt
  Documentation/watchdog: check return value for magic close
  watchdog: sbsa: Drop status function
  watchdog: Implement status function in watchdog core
  watchdog: tangox: Set max_hw_heartbeat_ms instead of max_timeout
  watchdog: change watchdog_need_worker logic
  watchdog: add support for MCP78S chipset in nv_tco
  watchdog: bcm2835_wdt: remove redundant ->set_timeout callback
  watchdog: bcm2835_wdt: constify _ops and _info structures
  dt-bindings: watchdog: Add Meson GXBB Watchdog bindings
  watchdog: Add Meson GXBB Watchdog Driver
  watchdog: qcom: configure BARK time in addition to BITE time
  watchdog: qcom: add option for standalone watchdog not in timer block
  watchdog: qcom: update device tree bindings
  ...
parents ba929b66 1ac06563

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

0 → 100644
+16 −0
Original line number Diff line number Diff line 
Aspeed Watchdog Timer



Required properties:

 - compatible: must be one of:

	- "aspeed,ast2400-wdt"

	- "aspeed,ast2500-wdt"



 - reg: physical base address of the controller and length of memory mapped

   region



Example:



	wdt1: watchdog@1e785000 {

		compatible = "aspeed,ast2400-wdt";

		reg = <0x1e785000 0x1c>;

	};

Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
Meson GXBB SoCs Watchdog timer



Required properties:



- compatible : should be "amlogic,meson-gxbb-wdt"

- reg : Specifies base physical address and size of the registers.

- clocks : Should be a phandle to the Watchdog clock source, for GXBB the xtal

	   is the default clock source.



Example:



wdt: watchdog@98d0 {

	compatible = "amlogic,meson-gxbb-wdt";

	reg = <0 0x98d0 0x0 0x10>;

	clocks = <&xtal>;

};

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

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ Required properties : 
			"qcom,kpss-wdt-msm8960"

			"qcom,kpss-wdt-apq8064"

			"qcom,kpss-wdt-ipq8064"

			"qcom,kpss-wdt-ipq4019"

			"qcom,kpss-timer"

			"qcom,scss-timer"

			"qcom,kpss-wdt"



- reg : shall contain base register location and length

- clocks : shall contain the input clock

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

+5 −1
Original line number Diff line number Diff line 
Renesas Watchdog Timer (WDT) Controller



Required properties:

- compatible : Should be "renesas,r8a7795-wdt", or "renesas,rcar-gen3-wdt"

- compatible : Should be "renesas,<soctype>-wdt", and

	       "renesas,rcar-gen3-wdt" as fallback.

	       Examples with soctypes are:

	         - "renesas,r8a7795-wdt" (R-Car H3)

	         - "renesas,r8a7796-wdt" (R-Car M3-W)



  When compatible with the generic version, nodes must list the SoC-specific

  version corresponding to the platform first, followed by the generic

Documentation/driver-model/devres.txt

+3 −0
Original line number Diff line number Diff line
@@ -357,3 +357,6 @@ SLAVE DMA ENGINE 


SPI

  devm_spi_register_master()



WATCHDOG

  devm_watchdog_register_device()