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

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

Merge tag 'watchdog-for-linus-v4.11' of... 

Merge tag 'watchdog-for-linus-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull watchdog updates from Guenter Roeck:
 "Wim asked me to handle the watchdog pull request this time around.

  Key changes:

   - New drivers: Cortina Gemini, ZTE's zx2967 family, NIC7018

   - Convert to use device managed functions: ebc-c384_wdt, tegra_wdt,
     da9063_wdt, da9062_wdt, da9055_wdt, da9052_wdt, bcm2835_wdt,
     mena21_wdt, wm831x_wdt, digicolor_wdt, intel-mid_wdt, meson_wdt,
     sunxi_wdt, aspeed_wdt, coh901327_wdt, iTCO_wdt

   - Use watchdog core to install restart handler: tangox, dw_wdt,
     bcm2835_wdt, asm9260_wdt, bcm47xx_wdt

   - Convert ts72xx_wdt driver to watchdog core

   - Let core handle heartbeat in ep93xx_wdt driver

   - Enable COMPILE_TEST where possible

   - Various other improvements"

* tag 'watchdog-for-linus-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (54 commits)
  watchdog: s3c2410: Add prefix to local function
  watchdog: s3c2410: Select MFD_SYSCON on all Exynos platforms
  watchdog: s3c2410: Use dev_dbg instead of pr_info
  watchdog: s3c2410: Fix infinite interrupt in soft mode
  watchdog: s3c2410: Remove confusing CONFIG prefix from local defines
  watchdog: softdog: make pretimeout support a compile option
  watchdog: zx2967: add watchdog controller driver for ZTE's zx2967 family
  dt: bindings: add documentation for zx2967 family watchdog controller
  watchdog: sama5d4: Implement resume hook
  watchdog: sama5d4: Cache MR instead of a partial config
  watchdog: ts72xx_wdt: convert driver to watchdog core
  watchdog: ep93xx_wdt: cleanup and let the core handle the heartbeat
  watchdog: RDC321X_WDT always depends on PCI
  watchdog: add driver for Cortina Gemini watchdog
  watchdog: add DT bindings for Cortina Gemini
  watchdog: constify watchdog_ops structures
  watchdog: Introduce watchdog_stop_on_unregister helper
  watchdog: ebc-c384_wdt: Utilize devm_ functions in driver probe callback
  watchdog: tegra_wdt: Convert to use device managed functions
  watchdog: da9063_wdt: Convert to use device managed functions
  ...
parents c4f3f22e e3a60ead

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

0 → 100644
+17 −0
Original line number Original line 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/samsung-wdt.txt

+5 −4
Original line number Original line Diff line number Diff line
@@ -6,10 +6,11 @@ occurred. 




Required properties:

Required properties:

- compatible : should be one among the following

- compatible : should be one among the following

	(a) "samsung,s3c2410-wdt" for Exynos4 and previous SoCs

	- "samsung,s3c2410-wdt" for S3C2410

	(b) "samsung,exynos5250-wdt" for Exynos5250

	- "samsung,s3c6410-wdt" for S3C6410, S5PV210 and Exynos4

	(c) "samsung,exynos5420-wdt" for Exynos5420

	- "samsung,exynos5250-wdt" for Exynos5250

	(c) "samsung,exynos7-wdt" for Exynos7

	- "samsung,exynos5420-wdt" for Exynos5420

	- "samsung,exynos7-wdt" for Exynos7





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

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

	region.

	region.

Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt

0 → 100644
+32 −0
Original line number Original line Diff line number Diff line 
ZTE zx2967 Watchdog timer



Required properties:



- compatible : should be one of the following.

       * zte,zx296718-wdt

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

- clocks : Pairs of phandle and specifier referencing the controller's clocks.

- resets : Reference to the reset controller controlling the watchdog

           controller.



Optional properties:



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

- zte,wdt-reset-sysctrl : Directs how to reset system by the watchdog.

	if we don't want to restart system when watchdog been triggered,

	it's not required, vice versa.

	It should include following fields.

	  * phandle of aon-sysctrl.

	  * offset of register that be written, should be 0xb0.

	  * configure value that be written to aon-sysctrl.

	  * bit mask, corresponding bits will be affected.



Example:



wdt: watchdog@1465000 {

	compatible = "zte,zx296718-wdt";

	reg = <0x1465000 0x1000>;

	clocks = <&topcrm WDT_WCLK>;

	resets = <&toprst 35>;

	zte,wdt-reset-sysctrl = <&aon_sysctrl 0xb0 1 0x115>;

};

Documentation/watchdog/watchdog-kernel-api.txt

+6 −0
Original line number Original line Diff line number Diff line
@@ -280,6 +280,12 @@ To disable the watchdog on reboot, the user must call the following helper: 




static inline void watchdog_stop_on_reboot(struct watchdog_device *wdd);

static inline void watchdog_stop_on_reboot(struct watchdog_device *wdd);





To disable the watchdog when unregistering the watchdog, the user must call

the following helper. Note that this will only stop the watchdog if the

nowayout flag is not set.



static inline void watchdog_stop_on_unregister(struct watchdog_device *wdd);



To change the priority of the restart handler the following helper should be

To change the priority of the restart handler the following helper should be

used:

used:

Documentation/watchdog/watchdog-parameters.txt

+5 −0
Original line number Original line Diff line number Diff line
@@ -209,6 +209,11 @@ timeout: Initial watchdog timeout in seconds (0<timeout<516, default=60) 
nowayout: Watchdog cannot be stopped once started

nowayout: Watchdog cannot be stopped once started

	(default=kernel config parameter)

	(default=kernel config parameter)

-------------------------------------------------

-------------------------------------------------

nic7018_wdt:

timeout: Initial watchdog timeout in seconds (0<timeout<464, default=80)

nowayout: Watchdog cannot be stopped once started

	(default=kernel config parameter)

-------------------------------------------------

nuc900_wdt:

nuc900_wdt:

heartbeat: Watchdog heartbeats in seconds.

heartbeat: Watchdog heartbeats in seconds.

	(default = 15)

	(default = 15)