Commit 032e22fe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull watchdog updates from Wim Van Sebroeck:

 - Remove usage of the deprecated ida_simple_xx() API

 - Add kernel-doc for wdt_set_timeout()

 - Add support for R-Car V4M, StarFive's JH8100 and sam9x7-wdt

 - Fixes and small improvements

* tag 'linux-watchdog-6.9-rc1' of git://www.linux-watchdog.org/linux-watchdog:
  watchdog: intel-mid_wdt: Get platform data via dev_get_platdata()
  watchdog: intel-mid_wdt: Don't use "proxy" headers
  watchdog: intel-mid_wdt: Remove unused intel-mid.h
  dt-bindings: watchdog: sama5d4-wdt: add compatible for sam9x7-wdt
  dt-bindings: watchdog: sprd,sp9860-wdt: convert to YAML
  dt-bindings: watchdog: starfive,jh7100-wdt: Add compatible for JH8100
  watchdog: stm32_iwdg: initialize default timeout
  dt-bindings: watchdog: arm,sp805: document the reset signal
  watchdog: sp805_wdt: deassert the reset if available
  watchdog/hpwdt: Support Suspend and Resume
  dt-bindings: watchdog: renesas-wdt: Add support for R-Car V4M
  watchdog: starfive: check watchdog status before enabling in system resume
  watchdog: starfive: Check pm_runtime_enabled() before decrementing usage counter
  watchdog: qcom: fine tune the max timeout value calculation
  watchdog: Add kernel-doc for wdt_set_timeout()
  watchdog: core: Remove usage of the deprecated ida_simple_xx() API
parents 75e41d42 6fe5aabf

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

+5 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ properties: 
      - const: wdog_clk

      - const: apb_pclk



  resets:

    maxItems: 1

    description: WDOGRESn input reset signal for sp805 module.



required:

  - compatible

  - reg
@@ -67,4 +71,5 @@ examples: 
        interrupts = <GIC_SPI 406 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&wdt_clk>, <&apb_pclk>;

        clock-names = "wdog_clk", "apb_pclk";

        resets = <&wdt_rst>;

    };

Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml

+8 −4
Original line number Diff line number Diff line
@@ -14,10 +14,14 @@ allOf: 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - atmel,sama5d4-wdt

          - microchip,sam9x60-wdt

          - microchip,sama7g5-wdt

      - items:

          - const: microchip,sam9x7-wdt

          - const: microchip,sam9x60-wdt



  reg:

    maxItems: 1

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

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ properties: 
              - renesas,r8a779a0-wdt     # R-Car V3U

              - renesas,r8a779f0-wdt     # R-Car S4-8

              - renesas,r8a779g0-wdt     # R-Car V4H

              - renesas,r8a779h0-wdt     # R-Car V4M

          - const: renesas,rcar-gen4-wdt # R-Car Gen4



  reg:

Documentation/devicetree/bindings/watchdog/sprd,sp9860-wdt.yaml

0 → 100644
+64 −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/sprd,sp9860-wdt.yaml#

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



title: Spreadtrum SP9860 watchdog timer



maintainers:

  - Orson Zhai <orsonzhai@gmail.com>

  - Baolin Wang <baolin.wang7@gmail.com>

  - Chunyan Zhang <zhang.lyra@gmail.com>



allOf:

  - $ref: watchdog.yaml#



properties:

  compatible:

    const: sprd,sp9860-wdt



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 2



  clock-names:

    items:

      - const: enable

      - const: rtc_enable



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names

  - timeout-sec



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/clock/sprd,sc9860-clk.h>

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

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



    soc {

        #address-cells = <2>;

        #size-cells = <2>;



        watchdog@40310000 {

            compatible = "sprd,sp9860-wdt";

            reg = <0 0x40310000 0 0x1000>;

            interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;

            clocks = <&aon_gate CLK_APCPU_WDG_EB>, <&aon_gate CLK_AP_WDG_RTC_EB>;

            clock-names = "enable", "rtc_enable";

            timeout-sec = <12>;

        };

    };

...

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

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
Spreadtrum SoCs Watchdog timer



Required properties:

- compatible : Should be "sprd,sp9860-wdt".

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

- interrupts : Exactly one interrupt specifier.

- timeout-sec : Contain the default watchdog timeout in seconds.

- clock-names : Contain the input clock names.

- clocks : Phandles to input clocks.



Example:

	watchdog: watchdog@40310000 {

		compatible = "sprd,sp9860-wdt";

		reg = <0 0x40310000 0 0x1000>;

		interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;

		timeout-sec = <12>;

		clock-names = "enable", "rtc_enable";

		clocks = <&clk_aon_apb_gates1 8>, <&clk_aon_apb_rtc_gates 9>;

	};