Commit 61f4c3e6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull watchdog updates from Wim Van Sebroeck:

 - Add Mediatek MT7988 watchdog

 - Add IT8659 watchdog

 - watchdog: set cdev owner before adding

 - hpwdt: Only claim UNKNOWN NMI if from iLO

 - Various other fixes and improvements

* tag 'linux-watchdog-6.8-rc1' of git://www.linux-watchdog.org/linux-watchdog: (30 commits)
  watchdog: mlx_wdt: fix all kernel-doc warnings
  dt-bindings: watchdog: qcom,pm8916-wdt: add parent spmi node to example
  dt-bindings: watchdog: nxp,pnx4008-wdt: convert txt to yaml
  dt-bindings: watchdog: qca,ar7130-wdt: convert txt to yaml
  dt-bindings: watchdog: intel,keembay: reference common watchdog schema
  dt-bindings: watchdog: re-order entries to match coding convention
  watchdog: it87_wdt: Keep WDTCTRL bit 3 unmodified for IT8784/IT8786
  watchdog: it87_wdt: Add IT8659 ID
  watchdog: it87_wdt: Remove redundant max_units setting
  watchdog: it87_wdt: add blank line after variable declaration
  dt-bindings: wdt: Add ts72xx
  dt-bindings: watchdog: dlg,da9062-watchdog: Document DA9063 watchdog
  dt-bindings: watchdog: dlg,da9062-watchdog: Add fallback for DA9061 watchdog
  watchdog: rti_wdt: Drop runtime pm reference count when watchdog is unused
  watchdog: starfive: add lock annotations to fix context imbalances
  watchdog: mediatek: mt7988: add wdt support
  dt-bindings: watchdog: mediatek,mtk-wdt: add MT7988 watchdog and toprgu
  dt-bindings: watchdog: realtek,rtd1295-watchdog: convert txt to yaml
  watchdog: bcm2835_wdt: Fix WDIOC_SETTIMEOUT handling
  watchdog/hpwdt: Remove unused variable
  ...
parents 5dfec3cf 9546b21e

Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml

+3 −3
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 


title: Allwinner A10 Watchdog



allOf:

  - $ref: watchdog.yaml#



maintainers:

  - Chen-Yu Tsai <wens@csie.org>

  - Maxime Ripard <mripard@kernel.org>



allOf:

  - $ref: watchdog.yaml#



properties:

  compatible:

    oneOf:

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

+3 −3
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 


title: Alphascale asm9260 Watchdog timer



allOf:

  - $ref: watchdog.yaml#



maintainers:

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



allOf:

  - $ref: watchdog.yaml#



properties:

  compatible:

    const: alphascale,asm9260-wdt

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

+3 −3
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 


title: Apple SoC Watchdog



allOf:

  - $ref: watchdog.yaml#



maintainers:

  - Sven Peter <sven@svenpeter.dev>



allOf:

  - $ref: watchdog.yaml#



properties:

  compatible:

    items:

Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml

+3 −3
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 


title: ARM Secure Monitor Call based watchdog



allOf:

  - $ref: watchdog.yaml#



maintainers:

  - Julius Werner <jwerner@chromium.org>



allOf:

  - $ref: watchdog.yaml#



properties:

  compatible:

    enum:

Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml

+5 −5
Original line number Diff line number Diff line
@@ -6,14 +6,14 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 


title: BCM63xx and BCM7038 watchdog timer



allOf:

  - $ref: watchdog.yaml#



maintainers:

  - Florian Fainelli <f.fainelli@gmail.com>

  - Justin Chen <justinpopo6@gmail.com>

  - Rafał Miłecki <rafal@milecki.pl>



allOf:

  - $ref: watchdog.yaml#



properties:

  compatible:

    enum:
@@ -29,11 +29,11 @@ properties: 
      The clock running the watchdog. If no clock is found the driver will

      default to 27000000 Hz.



unevaluatedProperties: false



required:

  - reg



unevaluatedProperties: false



examples:

  - |

    watchdog@f040a7e8 {