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

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

Pull watchdog updates from Wim Van Sebroeck:

 - Add watchdog timer for the NXP S32 platform

 - Add driver for Intel OC WDT

 - Add exynos990-wdt

 - Various other fixes and improvements

* tag 'linux-watchdog-6.16-rc1' of git://www.linux-watchdog.org/linux-watchdog: (22 commits)
  watchdog: iTCO_wdt: Update the heartbeat value after clamping timeout
  watchdog: Add driver for Intel OC WDT
  watchdog: arm_smc_wdt: get wdt status through SMCWD_GET_TIMELEFT
  watchdog: iTCO: Drop driver-internal locking
  watchdog: apple: set max_hw_heartbeat_ms instead of max_timeout
  watchdog: qcom: introduce the device data for IPQ5424 watchdog device
  dt-bindings: watchdog: renesas,wdt: Document RZ/V2N (R9A09G056) support
  watchdog: lenovo_se30_wdt: Fix possible devm_ioremap() NULL pointer dereference in lenovo_se30_wdt_probe()
  watchdog: s3c2410_wdt: Add exynos990-wdt compatible data
  dt-bindings: watchdog: samsung-wdt: Add exynos990-wdt compatible
  dt-bindings: watchdog: Add rk3562 compatible
  dt-bindings: watchdog: fsl,scu-wdt: Document imx8qm
  watchdog: Add the Watchdog Timer for the NXP S32 platform
  dt-bindings: watchdog: Add NXP Software Watchdog Timer
  watchdog: Correct kerneldoc warnings
  watchdog: stm32: Fix wakeup source leaks on device unbind
  watchdog: Do not enable by default during compile testing
  watchdog: cros-ec: Avoid -Wflex-array-member-not-at-end warning
  watchdog: da9052_wdt: respect TWDMIN
  watchdog: da9052_wdt: do not disable wdt during probe
  ...
parents a2604f8d 158f9f2f

Documentation/devicetree/bindings/watchdog/fsl,scu-wdt.yaml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ properties: 
    items:

      - enum:

          - fsl,imx8dxl-sc-wdt

          - fsl,imx8qm-sc-wdt

          - fsl,imx8qxp-sc-wdt

      - const: fsl,imx-sc-wdt

Documentation/devicetree/bindings/watchdog/nxp,s32g2-swt.yaml

0 → 100644
+54 −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/nxp,s32g2-swt.yaml#

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



title: NXP Software Watchdog Timer (SWT)



maintainers:

  - Daniel Lezcano <daniel.lezcano@kernel.org>



allOf:

  - $ref: watchdog.yaml#



properties:

  compatible:

    oneOf:

      - const: nxp,s32g2-swt

      - items:

          - const: nxp,s32g3-swt

          - const: nxp,s32g2-swt



  reg:

    maxItems: 1



  clocks:

    items:

      - description: Counter clock

      - description: Module clock

      - description: Register clock



  clock-names:

    items:

      - const: counter

      - const: module

      - const: register



required:

  - compatible

  - reg

  - clocks

  - clock-names



unevaluatedProperties: false



examples:

  - |

    watchdog@40100000 {

        compatible = "nxp,s32g2-swt";

        reg = <0x40100000 0x1000>;

        clocks = <&clks 0x3a>, <&clks 0x3b>, <&clks 0x3c>;

        clock-names = "counter", "module", "register";

        timeout-sec = <10>;

    };

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

+3 −1
Original line number Diff line number Diff line
@@ -76,7 +76,9 @@ properties: 
          - const: renesas,rcar-gen4-wdt # R-Car Gen4



      - items:

          - const: renesas,r9a09g047-wdt # RZ/G3E

          - enum:

              - renesas,r9a09g047-wdt # RZ/G3E

              - renesas,r9a09g056-wdt # RZ/V2N

          - const: renesas,r9a09g057-wdt # RZ/V2H(P)



      - const: renesas,r9a09g057-wdt       # RZ/V2H(P)

Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml

+7 −4
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ properties: 
          - samsung,exynos5420-wdt                # for Exynos5420

          - samsung,exynos7-wdt                   # for Exynos7

          - samsung,exynos850-wdt                 # for Exynos850

          - samsung,exynos990-wdt                 # for Exynos990

          - samsung,exynosautov9-wdt              # for Exynosautov9

          - samsung,exynosautov920-wdt            # for Exynosautov920

      - items:
@@ -49,14 +50,14 @@ properties: 
  samsung,cluster-index:

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

    description:

      Index of CPU cluster on which watchdog is running (in case of Exynos850

      or Google gs101).

      Index of CPU cluster on which watchdog is running (in case of Exynos850,

      Exynos990 or Google gs101).



  samsung,syscon-phandle:

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

    description:

      Phandle to the PMU system controller node (in case of Exynos5250,

      Exynos5420, Exynos7, Exynos850 and gs101).

      Exynos5420, Exynos7, Exynos850, Exynos990 and gs101).



required:

  - compatible
@@ -77,6 +78,7 @@ allOf: 
              - samsung,exynos5420-wdt

              - samsung,exynos7-wdt

              - samsung,exynos850-wdt

              - samsung,exynos990-wdt

              - samsung,exynosautov9-wdt

              - samsung,exynosautov920-wdt

    then:
@@ -89,6 +91,7 @@ allOf: 
            enum:

              - google,gs101-wdt

              - samsung,exynos850-wdt

              - samsung,exynos990-wdt

              - samsung,exynosautov9-wdt

              - samsung,exynosautov920-wdt

    then:
@@ -102,7 +105,7 @@ allOf: 
            - const: watchdog

            - const: watchdog_src

        samsung,cluster-index:

          enum: [0, 1]

          enum: [0, 1, 2]

      required:

        - samsung,cluster-index

    else:

Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ properties: 
              - rockchip,rk3328-wdt

              - rockchip,rk3368-wdt

              - rockchip,rk3399-wdt

              - rockchip,rk3562-wdt

              - rockchip,rk3568-wdt

              - rockchip,rk3576-wdt

              - rockchip,rk3588-wdt