Commit 6606b342 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 adds following items:

   - watchdog restart handler support
   - watchdog reboot notifier support
   - watchdog sysfs attributes
   - support for the following new devices: AMD Mullins platform, AMD
     Carrizo platform, meson8b SoC, CSRatlas7, TS-4800, Alphascale
     asm9260-wdt, Zodiac, Sigma Designs SMP86xx/SMP87xx
   - Changes in refcounting for the watchdog core
   - watchdog core improvements
   - and small fixes"

* git://www.linux-watchdog.org/linux-watchdog: (60 commits)
  watchdog: asm9260: remove __init and __exit annotations
  watchdog: Drop pointer to watchdog device from struct watchdog_device
  watchdog: ziirave: Use watchdog infrastructure to create sysfs attributes
  watchdog: Add support for creating driver specific sysfs attributes
  watchdog: kill unref/ref ops
  watchdog: stmp3xxx: Remove unused variables
  watchdog: add MT7621 watchdog support
  hwmon: (sch56xx) Drop watchdog driver data reference count callbacks
  watchdog: da9055_wdt: Drop reference counting
  watchdog: da9052_wdt: Drop reference counting
  watchdog: Separate and maintain variables based on variable lifetime
  watchdog: diag288: Stop re-using watchdog core internal flags
  watchdog: Create watchdog device in watchdog_dev.c
  watchdog: qcom-wdt: Do not set 'dev' in struct watchdog_device
  watchdog: mena21: Do not use device pointer from struct watchdog_device
  watchdog: gpio: Do not use device pointer from struct watchdog_device
  watchdog: tangox: Print info message using pointer to platform device
  watchdog: bcm2835_wdt: Drop log message if watchdog is stopped
  devicetree: watchdog: add binding for Sigma Designs SMP8642 watchdog
  watchdog: add support for Sigma Designs SMP86xx/SMP87xx
  ...
parents a016af2e ac36856f

Documentation/ABI/testing/sysfs-class-watchdog

0 → 100644
+51 −0
Original line number Diff line number Diff line 
What:		/sys/class/watchdog/watchdogn/bootstatus

Date:		August 2015

Contact:	Wim Van Sebroeck <wim@iguana.be>

Description:

		It is a read only file. It contains status of the watchdog

		device at boot. It is equivalent to WDIOC_GETBOOTSTATUS of

		ioctl interface.



What:		/sys/class/watchdog/watchdogn/identity

Date:		August 2015

Contact:	Wim Van Sebroeck <wim@iguana.be>

Description:

		It is a read only file. It contains identity string of

		watchdog device.



What:		/sys/class/watchdog/watchdogn/nowayout

Date:		August 2015

Contact:	Wim Van Sebroeck <wim@iguana.be>

Description:

		It is a read only file. While reading, it gives '1' if that

		device supports nowayout feature else, it gives '0'.



What:		/sys/class/watchdog/watchdogn/state

Date:		August 2015

Contact:	Wim Van Sebroeck <wim@iguana.be>

Description:

		It is a read only file. It gives active/inactive status of

		watchdog device.



What:		/sys/class/watchdog/watchdogn/status

Date:		August 2015

Contact:	Wim Van Sebroeck <wim@iguana.be>

Description:

		It is a read only file. It contains watchdog device's

		internal status bits. It is equivalent to WDIOC_GETSTATUS

		of ioctl interface.



What:		/sys/class/watchdog/watchdogn/timeleft

Date:		August 2015

Contact:	Wim Van Sebroeck <wim@iguana.be>

Description:

		It is a read only file. It contains value of time left for

		reset generation. It is equivalent to WDIOC_GETTIMELEFT of

		ioctl interface.



What:		/sys/class/watchdog/watchdogn/timeout

Date:		August 2015

Contact:	Wim Van Sebroeck <wim@iguana.be>

Description:

		It is a read only file. It is read to know about current

		value of timeout programmed.

Documentation/devicetree/bindings/watchdog/alphascale-asm9260.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 
Alphascale asm9260 Watchdog timer



Required properties:



- compatible : should be "alphascale,asm9260-wdt".

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

- clocks : the clocks feeding the watchdog timer. See clock-bindings.txt

- clock-names : should be set to

	"mod" - source for tick counter.

	"ahb" - ahb gate.

- resets : phandle pointing to the system reset controller with

	line index for the watchdog.

- reset-names : should be set to "wdt_rst".



Optional properties:

- timeout-sec : shall contain the default watchdog timeout in seconds,

	if unset, the default timeout is 30 seconds.

- alphascale,mode : three modes are supported

	"hw" - hw reset (default).

	"sw" - sw reset.

	"debug" - no action is taken.



Example:



watchdog0: watchdog@80048000 {

	compatible = "alphascale,asm9260-wdt";

	reg = <0x80048000 0x10>;

	clocks = <&acc CLKID_SYS_WDT>, <&acc CLKID_AHB_WDT>;

	clock-names = "mod", "ahb";

	interrupts = <55>;

	resets = <&rst WDT_RESET>;

	reset-names = "wdt_rst";

	timeout-sec = <30>;

	alphascale,mode = "hw";

};

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

0 → 100644
+12 −0
Original line number Diff line number Diff line 
Ralink Watchdog Timers



Required properties:

- compatible: must be "mediatek,mt7621-wdt"

- reg: physical base address of the controller and length of the register range



Example:



	watchdog@100 {

		compatible = "mediatek,mt7621-wdt";

		reg = <0x100 0x10>;

	};

Documentation/devicetree/bindings/watchdog/sigma,smp8642-wdt.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
Sigma Designs SMP86xx/SMP87xx watchdog



Required properties:

- compatible: Should be "sigma,smp8642-wdt"

- reg: Specifies the physical address region

- clocks: Should be a phandle to the clock



Optional properties:

- timeout-sec: watchdog timeout in seconds



Example:



watchdog@1fd00 {

	compatible = "sigma,smp8642-wdt";

	reg = <0x1fd00 8>;

	clocks = <&xtal_in_clk>;

	timeout-sec = <30>;

};

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

0 → 100644
+25 −0
Original line number Diff line number Diff line 
Technologic Systems Watchdog



Required properties:

- compatible: must be "technologic,ts4800-wdt"

- syscon: phandle / integer array that points to the syscon node which

          describes the FPGA's syscon registers.

          - phandle to FPGA's syscon

          - offset to the watchdog register



Optional property:

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



Example:



syscon: syscon@b0010000 {

	compatible = "syscon", "simple-mfd";

	reg = <0xb0010000 0x3d>;

	reg-io-width = <2>;



	wdt@e {

		compatible = "technologic,ts4800-wdt";

		syscon = <&syscon 0xe>;

		timeout-sec = <10>;

	};

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE