Commit 45860394 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull watchdog updates from Wim Van Sebroeck:

 - f71808e_wdt imporvements

 - dw_wdt improvements

 - mlx-wdt: support new watchdog type with longer timeout period

 - fallthrough pseudo-keyword replacements

 - overall small fixes and improvements

* tag 'linux-watchdog-5.9-rc1' of git://www.linux-watchdog.org/linux-watchdog: (35 commits)
  watchdog: rti-wdt: balance pm runtime enable calls
  watchdog: rti-wdt: attach to running watchdog during probe
  watchdog: add support for adjusting last known HW keepalive time
  watchdog: use __watchdog_ping in startup
  watchdog: softdog: Add options 'soft_reboot_cmd' and 'soft_active_on_boot'
  watchdog: pcwd_usb: remove needless check before usb_free_coherent()
  watchdog: Replace HTTP links with HTTPS ones
  dt-bindings: watchdog: renesas,wdt: Document r8a774e1 support
  watchdog: initialize device before misc_register
  watchdog: booke_wdt: Add common nowayout parameter driver
  watchdog: scx200_wdt: Use fallthrough pseudo-keyword
  watchdog: Use fallthrough pseudo-keyword
  watchdog: f71808e_wdt: do stricter parameter validation
  watchdog: f71808e_wdt: clear watchdog timeout occurred flag
  watchdog: f71808e_wdt: remove use of wrong watchdog_info option
  watchdog: f71808e_wdt: indicate WDIOF_CARDRESET support in watchdog_info.options
  docs: watchdog: codify ident.options as superset of possible status flags
  dt-bindings: watchdog: Add compatible for QCS404, SC7180, SDM845, SM8150
  dt-bindings: watchdog: Convert QCOM watchdog timer bindings to YAML
  watchdog: dw_wdt: Add DebugFS files
  ...
parents 407bc8d8 d5b29c2c

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

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ Optional properties: 
	   See clock-bindings.txt



Documentation:

Davinci DM646x - http://www.ti.com/lit/ug/spruer5b/spruer5b.pdf

Keystone - http://www.ti.com/lit/ug/sprugv5a/sprugv5a.pdf

Davinci DM646x - https://www.ti.com/lit/ug/spruer5b/spruer5b.pdf

Keystone - https://www.ti.com/lit/ug/sprugv5a/sprugv5a.pdf



Examples:

Documentation/devicetree/bindings/watchdog/dw_wdt.txt

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
Synopsys Designware Watchdog Timer



Required Properties:



- compatible	: Should contain "snps,dw-wdt"

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

- clocks	: phandle + clock-specifier for the clock that drives the

		watchdog timer.



Optional Properties:



- interrupts	: The interrupt used for the watchdog timeout warning.

- resets	: phandle pointing to the system reset controller with

		line index for the watchdog.



Example:



	watchdog0: wd@ffd02000 {

		compatible = "snps,dw-wdt";

		reg = <0xffd02000 0x1000>;

		interrupts = <0 171 4>;

		clocks = <&per_base_clk>;

		resets = <&rst WDT0_RESET>;

	};

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

deleted100644 → 0
+0 −28
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"

			"qcom,kpss-wdt-ipq4019"

			"qcom,kpss-timer"

			"qcom,scss-timer"

			"qcom,kpss-wdt"



- 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/qcom-wdt.yaml

0 → 100644
+48 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/watchdog/qcom-wdt.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Qualcomm Krait Processor Sub-system (KPSS) Watchdog timer



maintainers:

  - Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>



allOf:

  - $ref: watchdog.yaml#



properties:

  compatible:

    enum:

      - qcom,apss-wdt-qcs404

      - qcom,apss-wdt-sc7180

      - qcom,apss-wdt-sdm845

      - qcom,apss-wdt-sm8150

      - qcom,kpss-timer

      - qcom,kpss-wdt

      - qcom,kpss-wdt-apq8064

      - qcom,kpss-wdt-ipq4019

      - qcom,kpss-wdt-ipq8064

      - qcom,kpss-wdt-msm8960

      - qcom,scss-timer



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



required:

  - compatible

  - reg

  - clocks



examples:

  - |

    watchdog@208a038 {

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

      reg = <0x0208a038 0x40>;

      clocks = <&sleep_clk>;

      timeout-sec = <10>;

    };

Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ properties: 
              - renesas,r8a774a1-wdt     # RZ/G2M

              - renesas,r8a774b1-wdt     # RZ/G2N

              - renesas,r8a774c0-wdt     # RZ/G2E

              - renesas,r8a774e1-wdt     # RZ/G2H

              - renesas,r8a7795-wdt      # R-Car H3

              - renesas,r8a7796-wdt      # R-Car M3-W

              - renesas,r8a77961-wdt     # R-Car M3-W+

CRA Git | Maintained and supported by SUSTech CRA and CCSE