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

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

Pull watchdog updates from Wim Van Sebroeck:

 - Add watchdog support for:
     - Renesas WWDT
     - AST2700 platform
     - MediaTek MT8189 SoC
     - Loongson-2k0300 watchdog
     - Qualcomm Kaanapali watchdog
     - RK3506 compatible
     - Airoha AN7583 SoC

 - DT Schema conversions:
     - lantiq,wdt
     - TI OMAP
     - marvell,orion-wdt

 - Several other fixes and improvements

* tag 'linux-watchdog-6.19-rc1' of git://www.linux-watchdog.org/linux-watchdog: (30 commits)
  watchdog: starfive: Fix resource leak in probe error path
  dt-bindings: watchdog: airoha: Add support for Airoha AN7583 SoC
  dt-bindings: watchdog: lantiq,wdt: convert bindings to dtschema
  dt-bindings: watchdog: Add RK3506 compatible
  dt-bindings: watchdog: Document Qualcomm Kaanapali watchdog
  watchdog: wdat_wdt: Fix ACPI table leak in probe function
  watchdog: loongson1: Add Loongson-2k0300 watchdog support
  dt-bindings: watchdog: loongson,ls1x-wdt: Add ls2k0300-wdt compatible
  watchdog: loongson1: Drop CONFIG_OF
  watchdog: loongson1: Simplify ls1x_wdt_probe code
  watchdog: loongson1: Add missing MODULE_PARM_DESC
  watchdog/diag288: Fix module comment typos
  dt-bindings: watchdog: Support MediaTek MT8189 wdt
  dt-bindings: watchdog: mediatek,mtk-wdt: Add compatible for MT8189 SoC
  dt-bindings: mfd: rohm,bd96801-pmic: Correct timeout-sec length and reference watchdog schema
  dt-bindings: watchdog: Allow node names named 'pmic'
  dt-bindings: watchdog: Restrict timeout-sec to one number
  watchdog: renesas_wwdt: add driver
  dt-bindings: watchdog: Add Renesas WWDT
  dt-bindings: watchdog: Convert marvell,orion-wdt to DT schema
  ...
parents 973ec557 5bcc5786

Documentation/devicetree/bindings/mfd/rohm,bd96801-pmic.yaml

+5 −3
Original line number Diff line number Diff line
@@ -57,8 +57,7 @@ properties: 
      - prstb

      - intb-only



  timeout-sec:

    maxItems: 2

  timeout-sec: true



  regulators:

    $ref: /schemas/regulator/rohm,bd96801-regulator.yaml
@@ -72,7 +71,10 @@ required: 
  - interrupt-names

  - regulators



additionalProperties: false

allOf:

  - $ref: /schemas/watchdog/watchdog.yaml



unevaluatedProperties: false



examples:

  - |

Documentation/devicetree/bindings/watchdog/airoha,en7581-wdt.yaml

+5 −1
Original line number Diff line number Diff line
@@ -14,7 +14,11 @@ allOf: 


properties:

  compatible:

    const: airoha,en7581-wdt

    oneOf:

      - items:

          - const: airoha,an7583-wdt

          - const: airoha,en7581-wdt

      - const: airoha,en7581-wdt



  reg:

    maxItems: 1

Documentation/devicetree/bindings/watchdog/aspeed,ast2400-wdt.yaml

+6 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ properties: 
      - aspeed,ast2400-wdt

      - aspeed,ast2500-wdt

      - aspeed,ast2600-wdt

      - aspeed,ast2700-wdt



  reg:

    maxItems: 1
@@ -87,13 +88,15 @@ properties: 
  aspeed,reset-mask:

    $ref: /schemas/types.yaml#/definitions/uint32-array

    minItems: 1

    maxItems: 2

    maxItems: 5

    description: >

      A bitmask indicating which peripherals will be reset if the watchdog

      timer expires. On AST2500 SoCs this should be a single word defined using

      the AST2500_WDT_RESET_* macros; on AST2600 SoCs this should be a two-word

      array with the first word defined using the AST2600_WDT_RESET1_* macros,

      and the second word defined using the AST2600_WDT_RESET2_* macros.

      and the second word defined using the AST2600_WDT_RESET2_* macros; on

      AST2700 SoCs, this should be five-word array from AST2700_WDT_RESET1_*

      macros to AST2700_WDT_RESET5_* macros.



required:

  - compatible
@@ -114,6 +117,7 @@ allOf: 
          enum:

            - aspeed,ast2500-wdt

            - aspeed,ast2600-wdt

            - aspeed,ast2700-wdt

  - if:

      required:

        - aspeed,ext-active-high

Documentation/devicetree/bindings/watchdog/lantiq,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/lantiq,wdt.yaml#

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



title: Lantiq WTD watchdog



maintainers:

  - Hauke Mehrtens <hauke@hauke-m.de>



properties:

  compatible:

    oneOf:

      - enum:

          - lantiq,falcon-wdt

          - lantiq,wdt

          - lantiq,xrx100-wdt

      - items:

          - enum:

              - lantiq,xrx200-wdt

          - const: lantiq,xrx100-wdt



  reg:

    maxItems: 1



  lantiq,rcu:

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

    description: Phandle to the RCU syscon node



required:

  - compatible

  - reg



allOf:

  - $ref: watchdog.yaml#

  - if:

      properties:

        compatible:

          contains:

            enum:

              - lantiq,xrx100-wdt

              - lantiq,falcon-wdt

    then:

      required:

        - lantiq,rcu



unevaluatedProperties: false



examples:

  - |

    watchdog@803f0 {

        compatible = "lantiq,xrx200-wdt", "lantiq,xrx100-wdt";

        reg = <0x803f0 0x10>;



        lantiq,rcu = <&rcu0>;

    };

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

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
Lantiq WTD watchdog binding

============================



This describes the binding of the Lantiq watchdog driver.



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

Required properties:

- compatible		: Should be one of

				"lantiq,wdt"

				"lantiq,xrx100-wdt"

				"lantiq,xrx200-wdt", "lantiq,xrx100-wdt"

				"lantiq,falcon-wdt"

- reg			: Address of the watchdog block

- lantiq,rcu		: A phandle to the RCU syscon (required for

			  "lantiq,falcon-wdt" and "lantiq,xrx100-wdt")



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

Example for the watchdog on the xRX200 SoCs:

		watchdog@803f0 {

			compatible = "lantiq,xrx200-wdt", "lantiq,xrx100-wdt";

			reg = <0x803f0 0x10>;



			lantiq,rcu = <&rcu0>;

		};