Commit 0c8cfbad 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 patchset contains:
   - Various small clean-ups and fixes
   - boot logic hanegs for mpc8xxx_wdt
   - it87_wdt: Work around non-working CIR interrupts
   - iTCO_wdt: Fix the parent device
   - Kconfig dependencies
   - simplification of code with devm_ioremap_resource() or
     platform_driver_probe()
   - conversion of xilinx watchdog driver to Generic watchdog Framework
   - addition of extra functionality and devices for the xilinx watchdog
     driver
   - Addition of Tegra watchdog"

* git://www.linux-watchdog.org/linux-watchdog: (38 commits)
  watchdog: Fix Elan SC520 dependencies
  watchdog: ib700wdt: Use platform_driver_probe
  watchdog: geodewdt: Use platform_driver_probe
  watchdog: advantechwdt: Use platform_driver_probe
  watchdog: acquirewdt: Use platform_driver_probe
  watchdog: iTCO_wdt: Fix the parent device
  watchdog: it87_wdt: Work around non-working CIR interrupts
  watchdog: bcm281xx: Fix Kconfig dependency
  watchdog: s3c2410_wdt: Check return value of clk_prepare_enable
  watchdog: s3c2410_wdt: Remove unneeded initialization
  watchdog: sunxi: Change compatibles
  watchdog: orion: prepare new Dove DT Kconfig variable
  watchdog: fix checkpatch warnings and error
  watchdog: Add tegra watchdog
  watchdog: xilinx: Remove no_timeout variable
  watchdog: xilinx: Enable this driver for Zynq
  watchdog: xilinx: Add missing binding
  watchdog: xilinx: Use correct comment indentation
  watchdog: xilinx: Use of_property_read_u32
  watchdog: xilinx: Fix all printk messages
  ...
parents c12ac9f9 6d956e42

Documentation/devicetree/bindings/watchdog/of-xilinx-wdt.txt

0 → 100644
+23 −0
Original line number Diff line number Diff line 
Xilinx AXI/PLB soft-core watchdog Device Tree Bindings

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



Required properties:

- compatible		: Should be "xlnx,xps-timebase-wdt-1.00.a" or

			  "xlnx,xps-timebase-wdt-1.01.a".

- reg			: Physical base address and size



Optional properties:

- clock-frequency	: Frequency of clock in Hz

- xlnx,wdt-enable-once	: 0 - Watchdog can be restarted

			  1 - Watchdog can be enabled just once

- xlnx,wdt-interval	: Watchdog timeout interval in 2^<val> clock cycles,

			  <val> is integer from 8 to 31.



Example:

axi-timebase-wdt@40100000 {

	clock-frequency = <50000000>;

	compatible = "xlnx,xps-timebase-wdt-1.00.a";

	reg = <0x40100000 0x10000>;

	xlnx,wdt-enable-once = <0x0>;

	xlnx,wdt-interval = <0x1b>;

} ;

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

+3 −3
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ Allwinner SoCs Watchdog timer 


Required properties:



- compatible : should be "allwinner,<soc-family>-wdt", the currently supported

  SoC families being sun4i and sun6i

- compatible : should be either "allwinner,sun4i-a10-wdt" or

               "allwinner,sun6i-a31-wdt"

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



Example:



wdt: watchdog@01c20c90 {

	compatible = "allwinner,sun4i-wdt";

	compatible = "allwinner,sun4i-a10-wdt";

	reg = <0x01c20c90 0x10>;

};

Documentation/watchdog/watchdog-parameters.txt

+7 −0
Original line number Diff line number Diff line
@@ -150,6 +150,8 @@ nowayout: Disable watchdog shutdown on close 
-------------------------------------------------

it87_wdt:

nogameport: Forbid the activation of game port, default=0

nocir: Forbid the use of CIR (workaround for some buggy setups); set to 1 if

system resets despite watchdog daemon running, default=0

exclusive: Watchdog exclusive device open, default=1

timeout: Watchdog timeout in seconds, default=60

testmode: Watchdog test mode (1 = no reboot), default=0
@@ -325,6 +327,11 @@ soft_noboot: Softdog action, set to 1 to ignore reboots, 0 to reboot 
stmp3xxx_wdt:

heartbeat: Watchdog heartbeat period in seconds from 1 to 4194304, default 19

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

tegra_wdt:

heartbeat: Watchdog heartbeats in seconds. (default = 120)

nowayout: Watchdog cannot be stopped once started

	(default=kernel config parameter)

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

ts72xx_wdt:

timeout: Watchdog timeout in seconds. (1 <= timeout <= 8, default=8)

nowayout: Disable watchdog shutdown on close

drivers/watchdog/Kconfig

+23 −15
Original line number Diff line number Diff line
@@ -111,6 +111,15 @@ config WM8350_WATCHDOG 
	  Support for the watchdog in the WM8350 AudioPlus PMIC.  When

	  the watchdog triggers the system will be reset.



config XILINX_WATCHDOG

	tristate "Xilinx Watchdog timer"

	select WATCHDOG_CORE

	help

	  Watchdog driver for the xps_timebase_wdt ip core.



	  To compile this driver as a module, choose M here: the

	  module will be called of_xilinx_wdt.



# ALPHA Architecture



# ARM Architecture
@@ -292,7 +301,7 @@ config DAVINCI_WATCHDOG 


config ORION_WATCHDOG

	tristate "Orion watchdog"

	depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE

	depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE

	select WATCHDOG_CORE

	help

	  Say Y here if to include support for the watchdog timer
@@ -421,6 +430,17 @@ config SIRFSOC_WATCHDOG 
	  Support for CSR SiRFprimaII and SiRFatlasVI watchdog. When

	  the watchdog triggers the system will be reset.



config TEGRA_WATCHDOG

	tristate "Tegra watchdog"

	depends on ARCH_TEGRA || COMPILE_TEST

	select WATCHDOG_CORE

	help

	  Say Y here to include support for the watchdog timer

	  embedded in NVIDIA Tegra SoCs.



	  To compile this driver as a module, choose M here: the

	  module will be called tegra_wdt.



# AVR32 Architecture



config AT32AP700X_WDT
@@ -533,7 +553,7 @@ config GEODE_WDT 


config SC520_WDT

	tristate "AMD Elan SC520 processor Watchdog"

	depends on X86

	depends on MELAN

	help

	  This is the driver for the hardware watchdog built in to the

	  AMD "Elan" SC520 microcomputer commonly used in embedded systems.
@@ -1023,18 +1043,6 @@ config M54xx_WATCHDOG 


# MicroBlaze Architecture



config XILINX_WATCHDOG

	tristate "Xilinx Watchdog timer"

	depends on MICROBLAZE

	---help---

	  Watchdog driver for the xps_timebase_wdt ip core.



	  IMPORTANT: The xps_timebase_wdt parent must have the property

	  "clock-frequency" at device tree.



	  To compile this driver as a module, choose M here: the

	  module will be called of_xilinx_wdt.



# MIPS Architecture



config ATH79_WDT
@@ -1160,7 +1168,7 @@ config BCM2835_WDT 


config BCM_KONA_WDT

	tristate "BCM Kona Watchdog"

	depends on ARCH_BCM

	depends on ARCH_BCM_MOBILE

	select WATCHDOG_CORE

	help

	  Support for the watchdog timer on the following Broadcom BCM281xx

drivers/watchdog/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ obj-$(CONFIG_BCM2835_WDT) += bcm2835_wdt.o 
obj-$(CONFIG_MOXART_WDT) += moxart_wdt.o

obj-$(CONFIG_SIRFSOC_WATCHDOG) += sirfsoc_wdt.o

obj-$(CONFIG_BCM_KONA_WDT) += bcm_kona_wdt.o

obj-$(CONFIG_TEGRA_WATCHDOG) += tegra_wdt.o



# AVR32 Architecture

obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE