Commit 42d52acf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull watchdog updates from Wim Van Sebroeck:

 - Add support for exynosautov920 SoC

 - Add support for Airoha EN7851 watchdog

 - Add support for MT6735 TOPRGU/WDT

 - Delete the cpu5wdt driver

 - Always print when registering watchdog fails

 - Several other small fixes and improvements

* tag 'linux-watchdog-6.13-rc1' of git://www.linux-watchdog.org/linux-watchdog: (36 commits)
  watchdog: rti: of: honor timeout-sec property
  watchdog: s3c2410_wdt: add support for exynosautov920 SoC
  dt-bindings: watchdog: Document ExynosAutoV920 watchdog bindings
  watchdog: mediatek: Add support for MT6735 TOPRGU/WDT
  watchdog: mediatek: Make sure system reset gets asserted in mtk_wdt_restart()
  dt-bindings: watchdog: fsl-imx-wdt: Add missing 'big-endian' property
  dt-bindings: watchdog: Document Qualcomm QCS8300
  docs: ABI: Fix spelling mistake in pretimeout_avaialable_governors
  Revert "watchdog: s3c2410_wdt: use exynos_get_pmu_regmap_by_phandle() for PMU regs"
  watchdog: rzg2l_wdt: Power on the watchdog domain in the restart handler
  watchdog: Switch back to struct platform_driver::remove()
  watchdog: it87_wdt: add PWRGD enable quirk for Qotom QCML04
  watchdog: da9063: Remove __maybe_unused notations
  watchdog: da9063: Do not use a global variable
  watchdog: Delete the cpu5wdt driver
  watchdog: Add support for Airoha EN7851 watchdog
  dt-bindings: watchdog: airoha: document watchdog for Airoha EN7581
  watchdog: sl28cpld_wdt: don't print out if registering watchdog fails
  watchdog: rza_wdt: don't print out if registering watchdog fails
  watchdog: rti_wdt: don't print out if registering watchdog fails
  ...
parents 50760016 4962ee04

Documentation/ABI/testing/sysfs-class-watchdog

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ Description: 
		timeout when the pretimeout interrupt is delivered.  Pretimeout

		is an optional feature.



What:		/sys/class/watchdog/watchdogn/pretimeout_avaialable_governors

What:		/sys/class/watchdog/watchdogn/pretimeout_available_governors

Date:		February 2017

Contact:	Wim Van Sebroeck <wim@iguana.be>

Description:

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

0 → 100644
+47 −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/airoha,en7581-wdt.yaml#

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



title: Airoha EN7581 Watchdog Timer



maintainers:

  - Christian Marangi <ansuelsmth@gmail.com>



allOf:

  - $ref: watchdog.yaml#



properties:

  compatible:

    const: airoha,en7581-wdt



  reg:

    maxItems: 1



  clocks:

    description: BUS clock (timer ticks at half the BUS clock)

    maxItems: 1



  clock-names:

    const: bus



required:

  - compatible

  - reg

  - clocks

  - clock-names



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/clock/en7523-clk.h>



    watchdog@1fbf0100 {

        compatible = "airoha,en7581-wdt";

        reg = <0x1fbf0100 0x3c>;



        clocks = <&scuclk EN7523_CLK_BUS>;

        clock-names = "bus";

    };

Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml

+14 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ properties: 
  clocks:

    maxItems: 1



  big-endian: true



  fsl,ext-reset-output:

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

    description: |
@@ -93,6 +95,18 @@ allOf: 
      properties:

        fsl,suspend-in-wait: false



  - if:

      not:

        properties:

          compatible:

            contains:

              enum:

                - fsl,ls1012a-wdt

                - fsl,ls1043a-wdt

    then:

      properties:

        big-endian: false



unevaluatedProperties: false



examples:

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

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ properties: 
              - qcom,apss-wdt-msm8994

              - qcom,apss-wdt-qcm2290

              - qcom,apss-wdt-qcs404

              - qcom,apss-wdt-qcs615

              - qcom,apss-wdt-qcs8300

              - qcom,apss-wdt-sa8255p

              - qcom,apss-wdt-sa8775p

              - qcom,apss-wdt-sc7180

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

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ properties: 
          - samsung,exynos7-wdt                   # for Exynos7

          - samsung,exynos850-wdt                 # for Exynos850

          - samsung,exynosautov9-wdt              # for Exynosautov9

          - samsung,exynosautov920-wdt            # for Exynosautov920

      - items:

          - enum:

              - tesla,fsd-wdt
@@ -77,6 +78,7 @@ allOf: 
              - samsung,exynos7-wdt

              - samsung,exynos850-wdt

              - samsung,exynosautov9-wdt

              - samsung,exynosautov920-wdt

    then:

      required:

        - samsung,syscon-phandle
@@ -88,6 +90,7 @@ allOf: 
              - google,gs101-wdt

              - samsung,exynos850-wdt

              - samsung,exynosautov9-wdt

              - samsung,exynosautov920-wdt

    then:

      properties:

        clocks: