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

Commit 7e6127c1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull watchdog updates from Wim Van Sebroeck:

 - new watchdog device drivers for Realtek RTD1295 and Spreadtrum SC9860
   platform

 - add support for the following devices: jz4780 SoC, AST25xx series SoC
   and r8a77970 SoC

 - convert to watchdog framework: i6300esb_wdt, xen_wdt and sp5100_tco

 - several fixes for watchdog core

 - remove at32ap700x and obsolete documentation

 - gpio: Convert to use GPIO descriptors

 - rename gemini into FTWDT010 as this IP block is generc from Faraday
   Technology

 - various clean-ups and small bugfixes

 - add Guenter Roeck as co-maintainer

 - change maintainers e-mail address

* tag 'linux-watchdog-4.16-rc1' of git://www.linux-watchdog.org/linux-watchdog: (74 commits)
  documentation: watchdog: remove documentation of w83697hf_wdt/w83697ug_wdt
  documentation: watchdog: remove documentation for ixp2000
  documentation: watchdog: remove documentation of at32ap700x_wdt
  watchdog: remove at32ap700x_wdt
  watchdog: sp5100_tco: Add support for recent FCH versions
  watchdog: sp5100-tco: Abort if watchdog is disabled by hardware
  watchdog: sp5100_tco: Use bit operations
  watchdog: sp5100_tco: Convert to use watchdog subsystem
  watchdog: sp5100_tco: Clean up function and variable names
  watchdog: sp5100_tco: Use dev_ print functions where possible
  watchdog: sp5100_tco: Match PCI device early
  watchdog: sp5100_tco: Clean up sp5100_tco_setupdevice
  watchdog: sp5100_tco: Use standard error codes
  watchdog: sp5100_tco: Use request_muxed_region where possible
  watchdog: sp5100_tco: Fix watchdog disable bit
  watchdog: sp5100_tco: Always use SP5100_IO_PM_{INDEX_REG,DATA_REG}
  watchdog: core: make sure the watchdog_worker is not deferred
  watchdog: mt7621: switch to using managed devm_watchdog_register_device()
  watchdog: mt7621: set WDOG_HW_RUNNING bit when appropriate
  watchdog: imx2_wdt: restore previous timeout after suspend+resume
  ...
parents 413879a1 592a547a

Documentation/devicetree/bindings/watchdog/cortina,gemini-watchdog.txt

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
Cortina Systems Gemini SoC Watchdog



Required properties:

- compatible : must be "cortina,gemini-watchdog"

- reg : shall contain base register location and length

- interrupts : shall contain the interrupt for the watchdog



Optional properties:

- timeout-sec : the default watchdog timeout in seconds.



Example:



watchdog@41000000 {

	compatible = "cortina,gemini-watchdog";

	reg = <0x41000000 0x1000>;

	interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;

};

Documentation/devicetree/bindings/watchdog/cortina,gemin-watchdog.txt→Documentation/devicetree/bindings/watchdog/faraday,ftwdt010.txt

+8 −3
Original line number Diff line number Diff line 
Cortina Systems Gemini SoC Watchdog

Faraday Technology FTWDT010 watchdog



This is an IP part from Faraday Technology found in the Gemini

SoCs and others.



Required properties:

- compatible : must be "cortina,gemini-watchdog"

- compatible : must be one of

  "faraday,ftwdt010"

  "cortina,gemini-watchdog", "faraday,ftwdt010"

- reg : shall contain base register location and length

- interrupts : shall contain the interrupt for the watchdog
@@ -11,7 +16,7 @@ Optional properties: 
Example:



watchdog@41000000 {

	compatible = "cortina,gemini-watchdog";

	compatible = "faraday,ftwdt010";

	reg = <0x41000000 0x1000>;

	interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;

};

Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt

+2 −2
Original line number Diff line number Diff line 
Ingenic Watchdog Timer (WDT) Controller for JZ4740

Ingenic Watchdog Timer (WDT) Controller for JZ4740 & JZ4780



Required properties:

compatible: "ingenic,jz4740-watchdog"

compatible: "ingenic,jz4740-watchdog" or "ingenic,jz4780-watchdog"

reg: Register address and length for watchdog registers



Example:

Documentation/devicetree/bindings/watchdog/realtek,rtd119x.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Realtek RTD1295 Watchdog

========================



Required properties:



- compatible :  Should be "realtek,rtd1295-watchdog"

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

- clocks     :  Specifies one clock input





Example:



	watchdog@98007680 {

		compatible = "realtek,rtd1295-watchdog";

		reg = <0x98007680 0x100>;

		clocks = <&osc27M>;

	};

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

+2 −1
Original line number Diff line number Diff line
@@ -4,10 +4,11 @@ Required properties: 
- compatible : Should be "renesas,<soctype>-wdt", and

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

	       Examples with soctypes are:

	         - "renesas,r7s72100-wdt" (RZ/A1)

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

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

	         - "renesas,r8a77970-wdt" (R-Car V3M)

	         - "renesas,r8a77995-wdt" (R-Car D3)

	         - "renesas,r7s72100-wdt" (RZ/A1)



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

  version corresponding to the platform first, followed by the generic