Skip to content

Commit

Permalink
Merge tag 'linux-watchdog-6.8-rc1' of git://www.linux-watchdog.org/li…
Browse files Browse the repository at this point in the history
…nux-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
  ...
  • Loading branch information
torvalds committed Jan 12, 2024
2 parents 5dfec3c + 9546b21 commit 61f4c3e
Show file tree
Hide file tree
Showing 31 changed files with 307 additions and 137 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#

title: Allwinner A10 Watchdog

allOf:
- $ref: watchdog.yaml#

maintainers:
- Chen-Yu Tsai <[email protected]>
- Maxime Ripard <[email protected]>

allOf:
- $ref: watchdog.yaml#

properties:
compatible:
oneOf:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#

title: Alphascale asm9260 Watchdog timer

allOf:
- $ref: watchdog.yaml#

maintainers:
- Oleksij Rempel <[email protected]>

allOf:
- $ref: watchdog.yaml#

properties:
compatible:
const: alphascale,asm9260-wdt
Expand Down
6 changes: 3 additions & 3 deletions Documentation/devicetree/bindings/watchdog/apple,wdt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#

title: Apple SoC Watchdog

allOf:
- $ref: watchdog.yaml#

maintainers:
- Sven Peter <[email protected]>

allOf:
- $ref: watchdog.yaml#

properties:
compatible:
items:
Expand Down
6 changes: 3 additions & 3 deletions Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>

allOf:
- $ref: watchdog.yaml#

properties:
compatible:
enum:
Expand Down
10 changes: 5 additions & 5 deletions Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
- Justin Chen <[email protected]>
- Rafał Miłecki <[email protected]>

allOf:
- $ref: watchdog.yaml#

properties:
compatible:
enum:
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ description: |
timer counters. The first timer (called "Timer A") is the only one that can be
used as watchdog.
allOf:
- $ref: watchdog.yaml#

maintainers:
- Baruch Siach <[email protected]>

allOf:
- $ref: watchdog.yaml#

properties:
compatible:
const: cnxt,cx92755-wdt
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$id: http://devicetree.org/schemas/watchdog/dlg,da9062-watchdog.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Dialog Semiconductor DA9062/61 Watchdog Timer
title: Dialog Semiconductor DA906{1,2,3} Watchdog Timer

maintainers:
- Steve Twiss <[email protected]>
Expand All @@ -14,9 +14,13 @@ allOf:

properties:
compatible:
enum:
- dlg,da9061-watchdog
- dlg,da9062-watchdog
oneOf:
- enum:
- dlg,da9062-watchdog
- dlg,da9063-watchdog
- items:
- const: dlg,da9061-watchdog
- const: dlg,da9062-watchdog

dlg,use-sw-pm:
type: boolean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ title: Intel Keem Bay SoC non-secure Watchdog Timer
maintainers:
- Wan Ahmad Zainie <[email protected]>

allOf:
- $ref: watchdog.yaml#

properties:
compatible:
enum:
Expand Down Expand Up @@ -37,7 +40,7 @@ required:
- interrupt-names
- clocks

additionalProperties: false
unevaluatedProperties: false

examples:
- |
Expand Down
8 changes: 4 additions & 4 deletions Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#

title: Maxim 63xx Watchdog Timers

allOf:
- $ref: watchdog.yaml#
- $ref: /schemas/memory-controllers/mc-peripheral-props.yaml#

maintainers:
- Marc Zyngier <[email protected]>
- Linus Walleij <[email protected]>

allOf:
- $ref: watchdog.yaml#
- $ref: /schemas/memory-controllers/mc-peripheral-props.yaml#

properties:
compatible:
enum:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ properties:
- mediatek,mt6735-wdt
- mediatek,mt6795-wdt
- mediatek,mt7986-wdt
- mediatek,mt7988-wdt
- mediatek,mt8183-wdt
- mediatek,mt8186-wdt
- mediatek,mt8188-wdt
Expand Down
34 changes: 34 additions & 0 deletions Documentation/devicetree/bindings/watchdog/nxp,pnx4008-wdt.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
%YAML 1.2
---
$id: http://devicetree.org/schemas/watchdog/nxp,pnx4008-wdt.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: NXP PNX watchdog timer

maintainers:
- Roland Stigge <[email protected]>

allOf:
- $ref: watchdog.yaml#

properties:
compatible:
const: nxp,pnx4008-wdt

reg:
maxItems: 1

required:
- compatible
- reg

unevaluatedProperties: false

examples:
- |
watchdog@4003c000 {
compatible = "nxp,pnx4008-wdt";
reg = <0x4003c000 0x1000>;
timeout-sec = <10>;
};
17 changes: 0 additions & 17 deletions Documentation/devicetree/bindings/watchdog/pnx4008-wdt.txt

This file was deleted.

33 changes: 33 additions & 0 deletions Documentation/devicetree/bindings/watchdog/qca,ar7130-wdt.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/watchdog/qca,ar7130-wdt.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Qualcomm Atheros AR7130 Watchdog Timer (WDT) Controller

maintainers:
- Gabor Juhos <[email protected]>

allOf:
- $ref: watchdog.yaml#

properties:
compatible:
const: qca,ar7130-wdt

reg:
maxItems: 1

required:
- compatible
- reg

unevaluatedProperties: false

examples:
- |
watchdog@18060008 {
compatible = "qca,ar7130-wdt";
reg = <0x18060008 0x8>;
};
13 changes: 0 additions & 13 deletions Documentation/devicetree/bindings/watchdog/qca-ar7130-wdt.txt

This file was deleted.

33 changes: 19 additions & 14 deletions Documentation/devicetree/bindings/watchdog/qcom,pm8916-wdt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,27 @@ examples:
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/spmi/spmi.h>
pmic@0 {
compatible = "qcom,pm8916", "qcom,spmi-pmic";
reg = <0x0 SPMI_USID>;
#address-cells = <1>;
spmi {
#address-cells = <2>;
#size-cells = <0>;
pon@800 {
compatible = "qcom,pm8916-pon";
reg = <0x800>;
mode-bootloader = <0x2>;
mode-recovery = <0x1>;
watchdog {
compatible = "qcom,pm8916-wdt";
interrupts = <0x0 0x8 6 IRQ_TYPE_EDGE_RISING>;
timeout-sec = <60>;
pmic@0 {
compatible = "qcom,pm8916", "qcom,spmi-pmic";
reg = <0x0 SPMI_USID>;
#address-cells = <1>;
#size-cells = <0>;
pon@800 {
compatible = "qcom,pm8916-pon";
reg = <0x800>;
mode-bootloader = <0x2>;
mode-recovery = <0x1>;
watchdog {
compatible = "qcom,pm8916-wdt";
interrupts = <0x0 0x8 6 IRQ_TYPE_EDGE_RISING>;
timeout-sec = <60>;
};
};
};
};
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ examples:
compatible = "qcom,apss-wdt-sm8150", "qcom,kpss-wdt";
reg = <0x17c10000 0x1000>;
clocks = <&sleep_clk>;
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>;
timeout-sec = <10>;
};
Expand Down
17 changes: 0 additions & 17 deletions Documentation/devicetree/bindings/watchdog/realtek,rtd119x.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
%YAML 1.2
---
$id: http://devicetree.org/schemas/watchdog/realtek,rtd1295-watchdog.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Realtek RTD1295 Watchdog

maintainers:
- Andreas Färber <[email protected]>

allOf:
- $ref: watchdog.yaml#

properties:
compatible:
const: realtek,rtd1295-watchdog

reg:
maxItems: 1

clocks:
maxItems: 1

required:
- compatible
- reg
- clocks

unevaluatedProperties: false

examples:
- |
watchdog@98007680 {
compatible = "realtek,rtd1295-watchdog";
reg = <0x98007680 0x100>;
clocks = <&osc27M>;
};
Loading

0 comments on commit 61f4c3e

Please sign in to comment.