-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'linux-watchdog-6.1-rc1' of git://www.linux-watchdog.org/li…
…nux-watchdog Pull watchdog updates from Wim Van Sebroeck: - new driver for Exar/MaxLinear XR28V38x - support for exynosautov9 SoC - support for Renesas R-Car V5H (R8A779G0) and RZ/V2M (r9a09g011) SoC - support for imx93 - several other fixes and improvements * tag 'linux-watchdog-6.1-rc1' of git://www.linux-watchdog.org/linux-watchdog: (36 commits) watchdog: twl4030_wdt: add missing mod_devicetable.h include dt-bindings: watchdog: migrate mt7621 text bindings to YAML watchdog: sp5100_tco: Add "action" module parameter watchdog: imx93: add watchdog timer on imx93 watchdog: imx7ulp_wdt: init wdog when it was active watchdog: imx7ulp_wdt: Handle wdog reconfigure failure watchdog: imx7ulp_wdt: Fix RCS timeout issue watchdog: imx7ulp_wdt: Check CMD32EN in wdog init watchdog: imx7ulp: Add explict memory barrier for unlock sequence watchdog: imx7ulp: Move suspend/resume to noirq phase watchdog: rti-wdt:using the pm_runtime_resume_and_get to simplify the code dt-bindings: watchdog: rockchip: add rockchip,rk3128-wdt watchdog: s3c2410_wdt: support exynosautov9 watchdog dt-bindings: watchdog: add exynosautov9 compatible watchdog: npcm: Enable clock if provided watchdog: meson: keep running if already active watchdog: dt-bindings: atmel,at91sam9-wdt: convert to json-schema watchdog: armada_37xx_wdt: Fix .set_timeout callback watchdog: sa1100: make variable sa1100dog_driver static watchdog: w83977f_wdt: Fix comment typo ...
- Loading branch information
Showing
32 changed files
with
1,097 additions
and
223 deletions.
There are no files selected for viewing
127 changes: 127 additions & 0 deletions
127
Documentation/devicetree/bindings/watchdog/atmel,at91sam9-wdt.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,127 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
# Copyright (C) 2022 Microchip Technology, Inc. and its subsidiaries | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/watchdog/atmel,at91sam9-wdt.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Atmel Watchdog Timers | ||
|
||
maintainers: | ||
- Eugen Hristev <eugen.hristev@microchip.com> | ||
|
||
properties: | ||
compatible: | ||
const: atmel,at91sam9260-wdt | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
clocks: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
atmel,max-heartbeat-sec: | ||
description: | ||
Should contain the maximum heartbeat value in seconds. This value | ||
should be less or equal to 16. It is used to compute the WDV field. | ||
maximum: 16 | ||
|
||
atmel,min-heartbeat-sec: | ||
description: | ||
Should contain the minimum heartbeat value in seconds. This value | ||
must be smaller than the max-heartbeat-sec value. It is used to | ||
compute the WDD field. | ||
maximum: 16 | ||
|
||
atmel,watchdog-type: | ||
$ref: /schemas/types.yaml#/definitions/string | ||
description: | | ||
Should be hardware or software. | ||
oneOf: | ||
- description: | ||
Hardware watchdog uses the at91 watchdog reset. | ||
const: hardware | ||
- description: | | ||
Software watchdog uses the watchdog interrupt | ||
to trigger a software reset. | ||
const: software | ||
default: hardware | ||
|
||
atmel,reset-type: | ||
$ref: /schemas/types.yaml#/definitions/string | ||
description: | | ||
Should be proc or all. This is valid only when using hardware watchdog. | ||
oneOf: | ||
- description: | ||
Assert peripherals and processor reset signals. | ||
const: all | ||
- description: | ||
Assert the processor reset signal. | ||
const: proc | ||
default: all | ||
|
||
atmel,disable: | ||
$ref: /schemas/types.yaml#/definitions/flag | ||
description: | ||
Should be present if you want to stop the watchdog. | ||
|
||
atmel,idle-halt: | ||
$ref: /schemas/types.yaml#/definitions/flag | ||
description: | | ||
Should be present if you want to stop the watchdog when | ||
entering idle state. | ||
CAUTION: This property should be used with care, it actually makes the | ||
watchdog not counting when the CPU is in idle state, therefore the | ||
watchdog reset time depends on mean CPU usage and will not reset at all | ||
if the CPU stops working while it is in idle state, which is probably | ||
not what you want. | ||
atmel,dbg-halt: | ||
$ref: /schemas/types.yaml#/definitions/flag | ||
description: | | ||
Should be present if you want to stop the watchdog when | ||
entering debug state. | ||
required: | ||
- compatible | ||
- reg | ||
- clocks | ||
|
||
allOf: | ||
- $ref: watchdog.yaml# | ||
- if: | ||
properties: | ||
atmel,reset-type: | ||
enum: | ||
- all | ||
- proc | ||
then: | ||
properties: | ||
atmel,watchdog-type: | ||
const: hardware | ||
|
||
dependencies: | ||
atmel,reset-type: ['atmel,watchdog-type'] | ||
|
||
unevaluatedProperties: false | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/interrupt-controller/irq.h> | ||
watchdog@fffffd40 { | ||
compatible = "atmel,at91sam9260-wdt"; | ||
reg = <0xfffffd40 0x10>; | ||
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; | ||
clocks = <&clk32k>; | ||
timeout-sec = <15>; | ||
atmel,watchdog-type = "hardware"; | ||
atmel,reset-type = "all"; | ||
atmel,dbg-halt; | ||
atmel,idle-halt; | ||
atmel,max-heartbeat-sec = <16>; | ||
atmel,min-heartbeat-sec = <0>; | ||
}; |
This file was deleted.
Oops, something went wrong.
33 changes: 33 additions & 0 deletions
33
Documentation/devicetree/bindings/watchdog/mediatek,mt7621-wdt.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/mediatek,mt7621-wdt.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Ralink Watchdog Timers | ||
|
||
maintainers: | ||
- Sergio Paracuellos <sergio.paracuellos@gmail.com> | ||
|
||
allOf: | ||
- $ref: watchdog.yaml# | ||
|
||
properties: | ||
compatible: | ||
const: mediatek,mt7621-wdt | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
required: | ||
- compatible | ||
- reg | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
watchdog@100 { | ||
compatible = "mediatek,mt7621-wdt"; | ||
reg = <0x100 0x100>; | ||
}; |
This file was deleted.
Oops, something went wrong.
26 changes: 0 additions & 26 deletions
26
Documentation/devicetree/bindings/watchdog/of-xilinx-wdt.txt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.