Commit 21d2271f 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:
 - new Cadence WDT driver
 - new Ricoh RN5T618 watchdog
 - new DA9063 PMIC watchdog driver
 - new Meson WDT driver
 - add restart handling code
 - fixes and improvements

* git://www.linux-watchdog.org/linux-watchdog: (25 commits)
  watchdog: meson: remove magic value for reboot
  watchdog: Let XILINX_WATCHDOG and TEGRA_WATCHDOG depend on HAS_IOMEM
  watchdog: sunxi: Add A31 watchdog support
  watchdog: sunxi: support parameterized compatible strings
  watchdog: imx2_wdt: add restart handler support
  watchdog: qcom: register a restart notifier
  watchdog: s3c2410: add restart handler
  watchdog: dw_wdt: add restart handler support
  ARM: defconfig: update multi_v7_defconfig
  ARM: meson: add watchdog driver
  ARM: docs: add documentation binding for meson watchdog
  stmp3xxx_rtc_wdt: Add suspend/resume PM support
  watchdog: Add DA9063 PMIC watchdog driver.
  watchdog: add driver for Ricoh RN5T618 watchdog
  watchdog: s3c2410_wdt: Add support for Watchdog device on Exynos7
  watchdog: qcom: document device tree bindings
  watchdog: qcom: add support for KPSS WDT
  watchdog: dw_wdt: initialise TOP_INIT in dw_wdt_set_top()
  devicetree: Add Cadence WDT devicetree bindings documentation
  watchdog: Add Cadence WDT driver
  ...
parents 045aaeda 06980b24

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

0 → 100644
+24 −0
Original line number Diff line number Diff line 
Zynq Watchdog Device Tree Bindings

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



Required properties:

- compatible		: Should be "cdns,wdt-r1p2".

- clocks		: This is pclk (APB clock).

- interrupts		: This is wd_irq - watchdog timeout interrupt.

- interrupt-parent	: Must be core interrupt controller.



Optional properties

- reset-on-timeout	: If this property exists, then a reset is done

			  when watchdog times out.

- timeout-sec		: Watchdog timeout value (in seconds).



Example:

	watchdog@f8005000 {

		compatible = "cdns,wdt-r1p2";

		clocks = <&clkc 45>;

		interrupt-parent = <&intc>;

		interrupts = <0 9 1>;

		reg = <0xf8005000 0x1000>;

		reset-on-timeout;

		timeout-sec = <10>;

	};

Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ Required properties: 


Optional property:

- big-endian: If present the watchdog device's registers are implemented

  in big endian mode, otherwise in little mode.

  in big endian mode, otherwise in native mode(same with CPU), for more

  detail please see: Documentation/devicetree/bindings/regmap/regmap.txt.



Examples:

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

0 → 100644
+13 −0
Original line number Diff line number Diff line 
Meson SoCs Watchdog timer



Required properties:



- compatible : should be "amlogic,meson6-wdt"

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



Example:



wdt: watchdog@c1109900 {

	compatible = "amlogic,meson6-wdt";

	reg = <0xc1109900 0x8>;

};

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

0 → 100644
+24 −0
Original line number Diff line number Diff line 
Qualcomm Krait Processor Sub-system (KPSS) Watchdog

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



Required properties :

- compatible : shall contain only one of the following:



			"qcom,kpss-wdt-msm8960"

			"qcom,kpss-wdt-apq8064"

			"qcom,kpss-wdt-ipq8064"



- reg : shall contain base register location and length

- clocks : shall contain the input clock



Optional properties :

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

                if unset, the default timeout is 30 seconds



Example:

	watchdog@208a038 {

		compatible = "qcom,kpss-wdt-ipq8064";

		reg = <0x0208a038 0x40>;

		clocks = <&sleep_clk>;

		timeout-sec = <10>;

	};

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

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Required properties: 
	(a) "samsung,s3c2410-wdt" for Exynos4 and previous SoCs

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

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

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



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

	region.

CRA Git | Maintained and supported by SUSTech CRA and CCSE