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

Commit 68b86a25 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:
 "This contains:
   - fixes and improvements
   - devicetree bindings
   - conversion to watchdog generic framework of the following drivers:
        - booke_wdt
        - bcm47xx_wdt.c
        - at91sam9_wdt
   - Removal of old STMP3xxx driver
   - Addition of following new drivers:
        - new driver for STMP3xxx and i.MX23/28
        - Retu watchdog driver"

* git://www.linux-watchdog.org/linux-watchdog: (30 commits)
  watchdog: sp805_wdt depends on ARM
  watchdog: davinci_wdt: update to devm_* API
  watchdog: davinci_wdt: use devm managed clk get
  watchdog: at91rm9200: add DT support
  watchdog: add timeout-sec property binding
  watchdog: at91sam9_wdt: Convert to use the watchdog framework
  watchdog: omap_wdt: Add option nowayout
  watchdog: core: dt: add support for the timeout-sec dt property
  watchdog: bcm47xx_wdt.c: add hard timer
  watchdog: bcm47xx_wdt.c: rename wdt_time to timeout
  watchdog: bcm47xx_wdt.c: rename ops methods
  watchdog: bcm47xx_wdt.c: use platform device
  watchdog: bcm47xx_wdt.c: convert to watchdog core api
  watchdog: Convert BookE watchdog driver to watchdog infrastructure
  watchdog: s3c2410_wdt: Use devm_* functions
  watchdog: remove old STMP3xxx driver
  watchdog: add new driver for STMP3xxx and i.MX23/28
  rtc: stmp3xxx: add wdt-accessor function
  watchdog: introduce retu_wdt driver
  watchdog: intel_scu_watchdog: fix Kconfig dependency
  ...
parents 527c680f 41e9f3f7

Documentation/devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt

0 → 100644
+9 −0
Original line number Diff line number Diff line 
Atmel AT91RM9200 System Timer Watchdog



Required properties:

- compatible: must be "atmel,at91sam9260-wdt".



Example:

	watchdog@fffffd00 {

		compatible = "atmel,at91rm9200-wdt";

	};

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

+4 −0
Original line number Diff line number Diff line
@@ -7,9 +7,13 @@ Required properties: 
- reg: physical base address of the controller and length of memory mapped

  region.



Optional properties:

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



Example:



	watchdog@fffffd40 {

		compatible = "atmel,at91sam9260-wdt";

		reg = <0xfffffd40 0x10>;

		timeout-sec = <10>;

	};

Documentation/devicetree/bindings/watchdog/marvel.txt

+5 −0
Original line number Diff line number Diff line
@@ -5,10 +5,15 @@ Required Properties: 
- Compatibility : "marvell,orion-wdt"

- reg		: Address of the timer registers



Optional properties:



- timeout-sec	: Contains the watchdog timeout in seconds



Example:



	wdt@20300 {

		compatible = "marvell,orion-wdt";

		reg = <0x20300 0x28>;

		timeout-sec = <10>;

		status = "okay";

	};

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

+4 −0
Original line number Diff line number Diff line
@@ -5,9 +5,13 @@ Required properties: 
- reg: physical base address of the controller and length of memory mapped

  region.



Optional properties:

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



Example:



	watchdog@4003C000 {

		compatible = "nxp,pnx4008-wdt";

		reg = <0x4003C000 0x1000>;

		timeout-sec = <10>;

	};

Documentation/devicetree/bindings/watchdog/qca-ar7130-wdt.txt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
* Qualcomm Atheros AR7130 Watchdog Timer (WDT) Controller



Required properties:

- compatible: must be "qca,ar7130-wdt"

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

  region.



Example:



wdt@18060008 {

	compatible = "qca,ar9330-wdt", "qca,ar7130-wdt";

	reg = <0x18060008 0x8>;

};