Skip to content

Commit 78b421b

Browse files
committed
Merge tag 'linux-watchdog-6.4-rc1' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck: - Add watchdog driver for StarFive JH7100 and JH7110 Soc - Add Rockchip RK3588 devices - Add Qualcom IPQ5332 APSS, QCM2290 KPSS and SM6115 SoC devices - Add Mediatke MT8365 and MT6735 devices - Watchdog-core: Always set WDOG_HW_RUNNING when starting watchdog - Convert watchdog platform drivers to return void on the remove callback - Convert to devm_clk_get_enabled() helpers - ... and other small fixes and improvements * tag 'linux-watchdog-6.4-rc1' of git://www.linux-watchdog.org/linux-watchdog: (72 commits) watchdog: dw_wdt: Simplify clk management watchdog: dw_wdt: Fix the error handling path of dw_wdt_drv_probe() watchdog: starfive: Fix the warning of starfive_wdt_match watchdog: starfive: Fix the probe return error if PM and early_enable are both disabled MAINTAINERS: Add fragment for Xilinx watchdog driver watchdog: menz069_wdt: fix timeout setting watchdog: menz069_wdt: fix watchdog initialisation dt-bindings: watchdog: alphascale-asm9260: convert to DT schema watchdog: loongson1_wdt: Implement restart handler dt-bindings: watchdog: Document Qualcomm SM6115 watchdog dt-bindings: watchdog: realtek,otto-wdt: simplify requiring interrupt-names dt-bindings: watchdog: toshiba,visconti-wdt: simplify with unevaluatedProperties dt-bindings: watchdog: fsl-imx7ulp-wdt: simplify with unevaluatedProperties dt-bindings: watchdog: arm,sp805: drop unneeded minItems dt-bindings: watchdog: drop duplicated GPIO watchdog bindings dt-bindings: reset: Add binding for MediaTek MT6735 TOPRGU/WDT drivers: watchdog: Add StarFive Watchdog driver dt-bindings: watchdog: Add watchdog for StarFive JH7100 and JH7110 dt-bindings: watchdog: indentation, quotes and white-space cleanup watchdog: ebc-c384_wdt: Mark status as orphaned ...
2 parents 3c4aa44 + 10f67d1 commit 78b421b

74 files changed

Lines changed: 1154 additions & 560 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/watchdog/alphascale,asm9260-wdt.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Alphascale asm9260 Watchdog timer
8+
9+
allOf:
10+
- $ref: watchdog.yaml#
11+
12+
maintainers:
13+
- Oleksij Rempel <linux@rempel-privat.de>
14+
15+
properties:
16+
compatible:
17+
const: alphascale,asm9260-wdt
18+
19+
reg:
20+
maxItems: 1
21+
22+
clocks:
23+
items:
24+
- description: source clock, used for tick counter
25+
- description: ahb gate
26+
27+
clock-names:
28+
items:
29+
- const: mod
30+
- const: ahb
31+
32+
interrupts:
33+
maxItems: 1
34+
35+
resets:
36+
maxItems: 1
37+
38+
reset-names:
39+
items:
40+
- const: wdt_rst
41+
42+
alphascale,mode:
43+
description: |
44+
Specifies the reset mode of operation. If set to sw, then reset is handled
45+
via interrupt request, if set to debug, then it does nothing and logs.
46+
$ref: /schemas/types.yaml#/definitions/string
47+
enum: [hw, sw, debug]
48+
default: hw
49+
50+
required:
51+
- compatible
52+
- reg
53+
- clocks
54+
- clock-names
55+
- interrupts
56+
57+
unevaluatedProperties: false
58+
59+
examples:
60+
- |
61+
#include <dt-bindings/clock/alphascale,asm9260.h>
62+
watchdog0: watchdog@80048000 {
63+
compatible = "alphascale,asm9260-wdt";
64+
reg = <0x80048000 0x10>;
65+
clocks = <&acc CLKID_SYS_WDT>, <&acc CLKID_AHB_WDT>;
66+
clock-names = "mod", "ahb";
67+
interrupts = <55>;
68+
timeout-sec = <30>;
69+
alphascale,mode = "hw";
70+
};

Documentation/devicetree/bindings/watchdog/alphascale-asm9260.txt

Lines changed: 0 additions & 35 deletions
This file was deleted.

Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Copyright 2019 BayLibre, SAS
33
%YAML 1.2
44
---
5-
$id: "http://devicetree.org/schemas/watchdog/amlogic,meson-gxbb-wdt.yaml#"
6-
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
5+
$id: http://devicetree.org/schemas/watchdog/amlogic,meson-gxbb-wdt.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
77

88
title: Meson GXBB SoCs Watchdog timer
99

@@ -36,7 +36,7 @@ unevaluatedProperties: false
3636
examples:
3737
- |
3838
watchdog@98d0 {
39-
compatible = "amlogic,meson-gxbb-wdt";
40-
reg = <0x98d0 0x10>;
41-
clocks = <&xtal>;
39+
compatible = "amlogic,meson-gxbb-wdt";
40+
reg = <0x98d0 0x10>;
41+
clocks = <&xtal>;
4242
};

Documentation/devicetree/bindings/watchdog/arm,sbsa-gwdt.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ unevaluatedProperties: false
4040

4141
examples:
4242
- |
43-
4443
watchdog@2a440000 {
4544
compatible = "arm,sbsa-gwdt";
4645
reg = <0x2a440000 0x1000>,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ properties:
4343
Clocks driving the watchdog timer hardware. The first clock is used
4444
for the actual watchdog counter. The second clock drives the register
4545
interface.
46-
minItems: 2
4746
maxItems: 2
4847

4948
clock-names:

Documentation/devicetree/bindings/watchdog/arm,twd-wdt.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ examples:
4444
#include <dt-bindings/interrupt-controller/arm-gic.h>
4545
4646
watchdog@2c000620 {
47-
compatible = "arm,arm11mp-twd-wdt";
48-
reg = <0x2c000620 0x20>;
49-
interrupts = <GIC_PPI 14 0xf01>;
47+
compatible = "arm,arm11mp-twd-wdt";
48+
reg = <0x2c000620 0x20>;
49+
interrupts = <GIC_PPI 14 0xf01>;
5050
};

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ properties:
1616
compatible:
1717
enum:
1818
- arm,smc-wdt
19+
1920
arm,smc-id:
2021
$ref: /schemas/types.yaml#/definitions/uint32
2122
description: |
@@ -30,9 +31,9 @@ unevaluatedProperties: false
3031
examples:
3132
- |
3233
watchdog {
33-
compatible = "arm,smc-wdt";
34-
arm,smc-id = <0x82003D06>;
35-
timeout-sec = <15>;
34+
compatible = "arm,smc-wdt";
35+
arm,smc-id = <0x82003D06>;
36+
timeout-sec = <15>;
3637
};
3738
3839
...

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ examples:
6565
#include <dt-bindings/interrupt-controller/irq.h>
6666
6767
watchdog@fc068640 {
68-
compatible = "atmel,sama5d4-wdt";
69-
reg = <0xfc068640 0x10>;
70-
interrupts = <4 IRQ_TYPE_LEVEL_HIGH 5>;
71-
timeout-sec = <10>;
72-
atmel,watchdog-type = "hardware";
73-
atmel,dbg-halt;
74-
atmel,idle-halt;
68+
compatible = "atmel,sama5d4-wdt";
69+
reg = <0xfc068640 0x10>;
70+
interrupts = <4 IRQ_TYPE_LEVEL_HIGH 5>;
71+
timeout-sec = <10>;
72+
atmel,watchdog-type = "hardware";
73+
atmel,dbg-halt;
74+
atmel,idle-halt;
7575
};
7676
7777
...

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ required:
3737
examples:
3838
- |
3939
watchdog@f040a7e8 {
40-
compatible = "brcm,bcm7038-wdt";
41-
reg = <0xf040a7e8 0x16>;
42-
clocks = <&upg_fixed>;
40+
compatible = "brcm,bcm7038-wdt";
41+
reg = <0xf040a7e8 0x16>;
42+
clocks = <&upg_fixed>;
4343
};

Documentation/devicetree/bindings/watchdog/faraday,ftwdt010.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@ examples:
5252
- |
5353
#include <dt-bindings/interrupt-controller/irq.h>
5454
watchdog@41000000 {
55-
compatible = "faraday,ftwdt010";
56-
reg = <0x41000000 0x1000>;
57-
interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
58-
timeout-sec = <5>;
55+
compatible = "faraday,ftwdt010";
56+
reg = <0x41000000 0x1000>;
57+
interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
58+
timeout-sec = <5>;
5959
};
6060
- |
6161
watchdog: watchdog@98500000 {
62-
compatible = "moxa,moxart-watchdog", "faraday,ftwdt010";
63-
reg = <0x98500000 0x10>;
64-
clocks = <&clk_apb>;
65-
clock-names = "PCLK";
62+
compatible = "moxa,moxart-watchdog", "faraday,ftwdt010";
63+
reg = <0x98500000 0x10>;
64+
clocks = <&clk_apb>;
65+
clock-names = "PCLK";
6666
};
6767
...

0 commit comments

Comments
 (0)