Commit 6eaac34f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-watchdog-4.19-rc1' of git://www.linux-watchdog.org/linux-watchdog 

Pull watchdog updates from Wim Van Sebroeck:

 - add MEN 16z069 IP-Core driver

 - renesas-wdt: add support for the R8A77990 wdt

 - stm32_iwdg: Add stm32mp1 support and pclk feature

 - sp805_wdt, orion_wdt, sprd_wdt: several improvements

 - imx2_wdt, stmp3xxx: switch to SPDX identifier

* tag 'linux-watchdog-4.19-rc1' of git://www.linux-watchdog.org/linux-watchdog:
  watchdog: fix dependencies of menz69_wdt.o
  watchdog: sp805: Add clock-frequency property
  watchdog: add driver for the MEN 16z069 IP-Core
  watchdog: sprd_wdt: Remove redundant dev_err call in sprd_wdt_probe()
  watchdog: stmp3xxx: Switch to SPDX identifier
  watchdog: imx2_wdt: Switch to SPDX identifier
  watchdog: sp805: set WDOG_HW_RUNNING when appropriate
  watchdog: sp805: add 'timeout-sec' DT property support
  dt-bindings: watchdog: Add optional 'timeout-sec' property for sp805
  dt-bindings: watchdog: Consolidate SP805 binding docs
  watchdog: orion_wdt: Mark watchdog as active when running at probe
  watchdog: stm32: add pclk feature for stm32mp1
  dt-bindings: watchdog: add stm32mp1 support
  dt-bindings: watchdog: renesas-wdt: Add support for the R8A77990 wdt
parents 13bf2cf9 12aea518

Documentation/devicetree/bindings/watchdog/arm,sp805.txt

+22 −7
Original line number Diff line number Diff line 
ARM AMBA Primecell SP805 Watchdog



SP805 WDT is a ARM Primecell Peripheral and has a standard-id register that

can be used to identify the peripheral type, vendor, and revision.

This value can be used for driver matching.



As SP805 WDT is a primecell IP, it follows the base bindings specified in

'arm/primecell.txt'



Required properties:

- compatible:  Should be "arm,sp805" & "arm,primecell"

- reg: Should contain location and length for watchdog timer register.

- interrupts: Should contain the list of watchdog timer interrupts.

- clocks: clocks driving the watchdog timer hardware. This list should be 2

	clocks. With 2 clocks, the order is wdogclk clock, apb_pclk.

- reg:         Should contain location and length for watchdog timer register

- clocks:      Clocks driving the watchdog timer hardware. This list should be

               2 clocks. With 2 clocks, the order is wdog_clk, apb_pclk

               wdog_clk can be equal to or be a sub-multiple of the apb_pclk

               frequency

- clock-names: Shall be "wdog_clk" for first clock and "apb_pclk" for the

               second one



Optional properties:

- interrupts:  Should specify WDT interrupt number

- timeout-sec: Should specify default WDT timeout in seconds. If unset, the

               default timeout is determined by the driver



Example:

	watchdog@66090000 {

		compatible = "arm,sp805", "arm,primecell";

		reg = <0x66090000 0x1000>;

		interrupts = <GIC_SPI 406 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&apb_pclk>,<&apb_pclk>;

		clock-names = "wdogclk", "apb_pclk";

		clocks = <&wdt_clk>, <&apb_pclk>;

		clock-names = "wdog_clk", "apb_pclk";

	};

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

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ Required properties: 
	         - "renesas,r8a7796-wdt" (R-Car M3-W)

		 - "renesas,r8a77965-wdt" (R-Car M3-N)

	         - "renesas,r8a77970-wdt" (R-Car V3M)

	         - "renesas,r8a77990-wdt" (R-Car E3)

	         - "renesas,r8a77995-wdt" (R-Car D3)

	         - "renesas,r7s72100-wdt" (RZ/A1)

		The generic compatible string must be:

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

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
* ARM SP805 Watchdog Timer (WDT) Controller



SP805 WDT is a ARM Primecell Peripheral and has a standard-id register that

can be used to identify the peripheral type, vendor, and revision.

This value can be used for driver matching.



As SP805 WDT is a primecell IP, it follows the base bindings specified in

'arm/primecell.txt'



Required properties:

- compatible : Should be "arm,sp805-wdt", "arm,primecell"

- reg : Base address and size of the watchdog timer registers.

- clocks : From common clock binding.

           First clock is PCLK and the second is WDOGCLK.

           WDOGCLK can be equal to or be a sub-multiple of the PCLK frequency.

- clock-names : From common clock binding.

                Shall be "apb_pclk" for first clock and "wdog_clk" for the

                second one.



Optional properties:

- interrupts : Should specify WDT interrupt number.



Examples:



		cluster1_core0_watchdog: wdt@c000000 {

			compatible = "arm,sp805-wdt", "arm,primecell";

			reg = <0x0 0xc000000 0x0 0x1000>;

			clocks = <&clockgen 4 3>, <&clockgen 4 3>;

			clock-names = "apb_pclk", "wdog_clk";

		};

Documentation/devicetree/bindings/watchdog/st,stm32-iwdg.txt

+10 −3
Original line number Diff line number Diff line
@@ -2,9 +2,15 @@ STM32 Independent WatchDoG (IWDG) 
---------------------------------



Required properties:

- compatible: "st,stm32-iwdg"

- reg: physical base address and length of the registers set for the device

- clocks: must contain a single entry describing the clock input

- compatible: Should be either:

  - "st,stm32-iwdg"

  - "st,stm32mp1-iwdg"

- reg: Physical base address and length of the registers set for the device

- clocks: Reference to the clock entry lsi. Additional pclk clock entry

  is required only for st,stm32mp1-iwdg.

- clock-names: Name of the clocks used.

  "lsi" for st,stm32-iwdg

  "lsi", "pclk" for st,stm32mp1-iwdg



Optional Properties:

- timeout-sec: Watchdog timeout value in seconds.
@@ -15,5 +21,6 @@ iwdg: watchdog@40003000 { 
	compatible = "st,stm32-iwdg";

	reg = <0x40003000 0x400>;

	clocks = <&clk_lsi>;

	clock-names = "lsi";

	timeout-sec = <32>;

};

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -9427,6 +9427,12 @@ F: drivers/leds/leds-menf21bmc.c 
F:	drivers/hwmon/menf21bmc_hwmon.c

F:	Documentation/hwmon/menf21bmc



MEN Z069 WATCHDOG DRIVER

M:	Johannes Thumshirn <jth@kernel.org>

L:	linux-watchdog@vger.kernel.org

S:	Maintained

F:	drivers/watchdog/menz069_wdt.c



MESON AO CEC DRIVER FOR AMLOGIC SOCS

M:	Neil Armstrong <narmstrong@baylibre.com>

L:	linux-media@lists.freedesktop.org

CRA Git | Maintained and supported by SUSTech CRA and CCSE