Commit 78b421b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull watchdog updates from Wim Van Sebroeck:

 - Add watchdog driver for StarFive JH7100 and JH7110 Soc

 - Add Rockchip RK3588 devices

 - Add Qualcom IPQ5332 APSS, QCM2290 KPSS and SM6115 SoC devices

 - Add Mediatke MT8365 and MT6735 devices

 - Watchdog-core: Always set WDOG_HW_RUNNING when starting watchdog

 - Convert watchdog platform drivers to return void on the remove
   callback

 - Convert to devm_clk_get_enabled() helpers

 - ... and other small fixes and improvements

* tag 'linux-watchdog-6.4-rc1' of git://www.linux-watchdog.org/linux-watchdog: (72 commits)
  watchdog: dw_wdt: Simplify clk management
  watchdog: dw_wdt: Fix the error handling path of dw_wdt_drv_probe()
  watchdog: starfive: Fix the warning of starfive_wdt_match
  watchdog: starfive: Fix the probe return error if PM and early_enable are both disabled
  MAINTAINERS: Add fragment for Xilinx watchdog driver
  watchdog: menz069_wdt: fix timeout setting
  watchdog: menz069_wdt: fix watchdog initialisation
  dt-bindings: watchdog: alphascale-asm9260: convert to DT schema
  watchdog: loongson1_wdt: Implement restart handler
  dt-bindings: watchdog: Document Qualcomm SM6115 watchdog
  dt-bindings: watchdog: realtek,otto-wdt: simplify requiring interrupt-names
  dt-bindings: watchdog: toshiba,visconti-wdt: simplify with unevaluatedProperties
  dt-bindings: watchdog: fsl-imx7ulp-wdt: simplify with unevaluatedProperties
  dt-bindings: watchdog: arm,sp805: drop unneeded minItems
  dt-bindings: watchdog: drop duplicated GPIO watchdog bindings
  dt-bindings: reset: Add binding for MediaTek MT6735 TOPRGU/WDT
  drivers: watchdog: Add StarFive Watchdog driver
  dt-bindings: watchdog: Add watchdog for StarFive JH7100 and JH7110
  dt-bindings: watchdog: indentation, quotes and white-space cleanup
  watchdog: ebc-c384_wdt: Mark status as orphaned
  ...
parents 3c4aa443 10f67d1f

Documentation/devicetree/bindings/watchdog/alphascale,asm9260-wdt.yaml

0 → 100644
+70 −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/alphascale,asm9260-wdt.yaml#

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



title: Alphascale asm9260 Watchdog timer



allOf:

  - $ref: watchdog.yaml#



maintainers:

  - Oleksij Rempel <linux@rempel-privat.de>



properties:

  compatible:

    const: alphascale,asm9260-wdt



  reg:

    maxItems: 1



  clocks:

    items:

      - description: source clock, used for tick counter

      - description: ahb gate



  clock-names:

    items:

      - const: mod

      - const: ahb



  interrupts:

    maxItems: 1



  resets:

    maxItems: 1



  reset-names:

    items:

      - const: wdt_rst



  alphascale,mode:

    description: |

      Specifies the reset mode of operation. If set to sw, then reset is handled

      via interrupt request, if set to debug, then it does nothing and logs.

    $ref: /schemas/types.yaml#/definitions/string

    enum: [hw, sw, debug]

    default: hw



required:

  - compatible

  - reg

  - clocks

  - clock-names

  - interrupts



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/clock/alphascale,asm9260.h>

    watchdog0: watchdog@80048000 {

      compatible = "alphascale,asm9260-wdt";

      reg = <0x80048000 0x10>;

      clocks = <&acc CLKID_SYS_WDT>, <&acc CLKID_AHB_WDT>;

      clock-names = "mod", "ahb";

      interrupts = <55>;

      timeout-sec = <30>;

      alphascale,mode = "hw";

    };

Documentation/devicetree/bindings/watchdog/alphascale-asm9260.txt

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
Alphascale asm9260 Watchdog timer



Required properties:



- compatible : should be "alphascale,asm9260-wdt".

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

- clocks : the clocks feeding the watchdog timer. See clock-bindings.txt

- clock-names : should be set to

	"mod" - source for tick counter.

	"ahb" - ahb gate.

- resets : phandle pointing to the system reset controller with

	line index for the watchdog.

- reset-names : should be set to "wdt_rst".



Optional properties:

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

	if unset, the default timeout is 30 seconds.

- alphascale,mode : three modes are supported

	"hw" - hw reset (default).

	"sw" - sw reset.

	"debug" - no action is taken.



Example:



watchdog0: watchdog@80048000 {

	compatible = "alphascale,asm9260-wdt";

	reg = <0x80048000 0x10>;

	clocks = <&acc CLKID_SYS_WDT>, <&acc CLKID_AHB_WDT>;

	clock-names = "mod", "ahb";

	interrupts = <55>;

	resets = <&rst WDT_RESET>;

	reset-names = "wdt_rst";

	timeout-sec = <30>;

	alphascale,mode = "hw";

};

Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml

+5 −5
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
# Copyright 2019 BayLibre, SAS

%YAML 1.2

---

$id: "http://devicetree.org/schemas/watchdog/amlogic,meson-gxbb-wdt.yaml#"

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

$id: http://devicetree.org/schemas/watchdog/amlogic,meson-gxbb-wdt.yaml#

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



title: Meson GXBB SoCs Watchdog timer

Documentation/devicetree/bindings/watchdog/arm,sbsa-gwdt.yaml

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ unevaluatedProperties: false 


examples:

  - |



    watchdog@2a440000 {

        compatible = "arm,sbsa-gwdt";

        reg = <0x2a440000 0x1000>,

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

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ properties: 
      Clocks driving the watchdog timer hardware. The first clock is used

      for the actual watchdog counter. The second clock drives the register

      interface.

    minItems: 2

    maxItems: 2



  clock-names: