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

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

Pull watchdog updates from Wim Van Sebroeck:
 "New drivers:
   - Intel Keembay Soc

  New chip versions:
   - sun4i: Add H616 compatible string
   - mt8192 wdt support
   - more Rockchip compatibles to snps,dw-wdt.yaml
   - binding for Qcom SDX55
   - r8a779a0 (V3U) support

  Removed drivers:
   - sirf prima watchdog driver
   - sirf atlas watchdog driver
   - zte zx watchdog driver
   - tango watchdog driver
   - coh901 watchdog driver

  And several fixes and clean-ups"

* tag 'linux-watchdog-5.12-rc1' of git://www.linux-watchdog.org/linux-watchdog: (24 commits)
  watchdog: qcom: Remove incorrect usage of QCOM_WDT_ENABLE_IRQ
  watchdog: mei_wdt: request stop on unregister
  dt-bindings: watchdog: Add binding for Qcom SDX55
  watchdog: remove coh901 driver
  watchdog: remove tango driver
  watchdog: remove zte zx driver
  watchdog: remove sirf atlas driver
  watchdog: remove sirf prima driver
  watchdog: mt8192: add wdt support
  dt-binding: mt8192: add toprgu reset-controller head file
  dt-binding: mediatek: mt8192: update mtk-wdt document
  dt-binding: mediatek: watchdog: fix the description of compatible
  dt-binding: watchdog: add more Rockchip compatibles to snps,dw-wdt.yaml
  dt-bindings: watchdog: sun4i: Add H616 compatible string
  watchdog: mtk_wdt: Remove mtk_wdt_stop() in probe() to prevent the system freeze and it doesn't reboot by watchdog problem
  watchdog: renesas_wdt: add grace period before rebooting
  watchdog: stop wdd when watchdog hw running in reboot_notifier
  watchdog: ziirave_wdt: remove unused including <linux/version.h>
  dt-bindings: watchdog: renesas,wdt: add r8a779a0 (V3U) support
  watchdog: renesas_wdt: don't sleep in atomic context
  ...
parents 19472481 a4f3407c

Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml

+5 −7
Original line number Diff line number Diff line
@@ -19,13 +19,11 @@ properties: 
      - const: allwinner,sun4i-a10-wdt

      - const: allwinner,sun6i-a31-wdt

      - items:

          - const: allwinner,sun50i-a64-wdt

          - const: allwinner,sun6i-a31-wdt

      - items:

          - const: allwinner,sun50i-a100-wdt

          - const: allwinner,sun6i-a31-wdt

      - items:

          - const: allwinner,sun50i-h6-wdt

          - enum:

              - allwinner,sun50i-a64-wdt

              - allwinner,sun50i-a100-wdt

              - allwinner,sun50i-h6-wdt

              - allwinner,sun50i-h616-wdt

          - const: allwinner,sun6i-a31-wdt

      - items:

          - const: allwinner,suniv-f1c100s-wdt

Documentation/devicetree/bindings/watchdog/intel,keembay-wdt.yaml

0 → 100644
+57 −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/intel,keembay-wdt.yaml#

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



title: Intel Keem Bay SoC non-secure Watchdog Timer



maintainers:

  - Wan Ahmad Zainie <wan.ahmad.zainie.wan.mohamad@intel.com>



properties:

  compatible:

    enum:

      - intel,keembay-wdt



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  interrupts:

    items:

      - description: interrupt specifier for threshold interrupt line

      - description: interrupt specifier for timeout interrupt line



  interrupt-names:

    items:

      - const: threshold

      - const: timeout



required:

  - compatible

  - reg

  - interrupts

  - interrupt-names

  - clocks



additionalProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/interrupt-controller/irq.h>

    #define KEEM_BAY_A53_TIM



    watchdog: watchdog@2033009c {

        compatible = "intel,keembay-wdt";

        reg = <0x2033009c 0x10>;

        interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,

                     <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;

        interrupt-names = "threshold", "timeout";

        clocks = <&scmi_clk KEEM_BAY_A53_TIM>;

    };



...

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

+3 −2
Original line number Diff line number Diff line
@@ -4,14 +4,15 @@ Required properties: 


- compatible should contain:

	"mediatek,mt2701-wdt", "mediatek,mt6589-wdt": for MT2701

	"mediatek,mt2712-wdt", "mediatek,mt6589-wdt": for MT2712

	"mediatek,mt2712-wdt": for MT2712

	"mediatek,mt6589-wdt": for MT6589

	"mediatek,mt6797-wdt", "mediatek,mt6589-wdt": for MT6797

	"mediatek,mt7622-wdt", "mediatek,mt6589-wdt": for MT7622

	"mediatek,mt7623-wdt", "mediatek,mt6589-wdt": for MT7623

	"mediatek,mt7629-wdt", "mediatek,mt6589-wdt": for MT7629

	"mediatek,mt8183-wdt", "mediatek,mt6589-wdt": for MT8183

	"mediatek,mt8183-wdt": for MT8183

	"mediatek,mt8516-wdt", "mediatek,mt6589-wdt": for MT8516

	"mediatek,mt8192-wdt": for MT8192



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

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

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ properties: 
              - renesas,r8a77980-wdt     # R-Car V3H

              - renesas,r8a77990-wdt     # R-Car E3

              - renesas,r8a77995-wdt     # R-Car D3

              - renesas,r8a779a0-wdt     # R-Car V3U

          - const: renesas,rcar-gen3-wdt # R-Car Gen3 and RZ/G2



  reg:

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

deleted100644 → 0
+0 −18
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>;

};