Skip to content

Commit 42d52ac

Browse files
committed
Merge tag 'linux-watchdog-6.13-rc1' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck: - Add support for exynosautov920 SoC - Add support for Airoha EN7851 watchdog - Add support for MT6735 TOPRGU/WDT - Delete the cpu5wdt driver - Always print when registering watchdog fails - Several other small fixes and improvements * tag 'linux-watchdog-6.13-rc1' of git://www.linux-watchdog.org/linux-watchdog: (36 commits) watchdog: rti: of: honor timeout-sec property watchdog: s3c2410_wdt: add support for exynosautov920 SoC dt-bindings: watchdog: Document ExynosAutoV920 watchdog bindings watchdog: mediatek: Add support for MT6735 TOPRGU/WDT watchdog: mediatek: Make sure system reset gets asserted in mtk_wdt_restart() dt-bindings: watchdog: fsl-imx-wdt: Add missing 'big-endian' property dt-bindings: watchdog: Document Qualcomm QCS8300 docs: ABI: Fix spelling mistake in pretimeout_avaialable_governors Revert "watchdog: s3c2410_wdt: use exynos_get_pmu_regmap_by_phandle() for PMU regs" watchdog: rzg2l_wdt: Power on the watchdog domain in the restart handler watchdog: Switch back to struct platform_driver::remove() watchdog: it87_wdt: add PWRGD enable quirk for Qotom QCML04 watchdog: da9063: Remove __maybe_unused notations watchdog: da9063: Do not use a global variable watchdog: Delete the cpu5wdt driver watchdog: Add support for Airoha EN7851 watchdog dt-bindings: watchdog: airoha: document watchdog for Airoha EN7581 watchdog: sl28cpld_wdt: don't print out if registering watchdog fails watchdog: rza_wdt: don't print out if registering watchdog fails watchdog: rti_wdt: don't print out if registering watchdog fails ...
2 parents 5076001 + 4962ee0 commit 42d52ac

35 files changed

+631
-394
lines changed

Documentation/ABI/testing/sysfs-class-watchdog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Description:
7676
timeout when the pretimeout interrupt is delivered. Pretimeout
7777
is an optional feature.
7878

79-
What: /sys/class/watchdog/watchdogn/pretimeout_avaialable_governors
79+
What: /sys/class/watchdog/watchdogn/pretimeout_available_governors
8080
Date: February 2017
8181
Contact: Wim Van Sebroeck <wim@iguana.be>
8282
Description:
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/watchdog/airoha,en7581-wdt.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Airoha EN7581 Watchdog Timer
8+
9+
maintainers:
10+
- Christian Marangi <ansuelsmth@gmail.com>
11+
12+
allOf:
13+
- $ref: watchdog.yaml#
14+
15+
properties:
16+
compatible:
17+
const: airoha,en7581-wdt
18+
19+
reg:
20+
maxItems: 1
21+
22+
clocks:
23+
description: BUS clock (timer ticks at half the BUS clock)
24+
maxItems: 1
25+
26+
clock-names:
27+
const: bus
28+
29+
required:
30+
- compatible
31+
- reg
32+
- clocks
33+
- clock-names
34+
35+
unevaluatedProperties: false
36+
37+
examples:
38+
- |
39+
#include <dt-bindings/clock/en7523-clk.h>
40+
41+
watchdog@1fbf0100 {
42+
compatible = "airoha,en7581-wdt";
43+
reg = <0x1fbf0100 0x3c>;
44+
45+
clocks = <&scuclk EN7523_CLK_BUS>;
46+
clock-names = "bus";
47+
};

Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ properties:
4848
clocks:
4949
maxItems: 1
5050

51+
big-endian: true
52+
5153
fsl,ext-reset-output:
5254
$ref: /schemas/types.yaml#/definitions/flag
5355
description: |
@@ -93,6 +95,18 @@ allOf:
9395
properties:
9496
fsl,suspend-in-wait: false
9597

98+
- if:
99+
not:
100+
properties:
101+
compatible:
102+
contains:
103+
enum:
104+
- fsl,ls1012a-wdt
105+
- fsl,ls1043a-wdt
106+
then:
107+
properties:
108+
big-endian: false
109+
96110
unevaluatedProperties: false
97111

98112
examples:

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ properties:
2626
- qcom,apss-wdt-msm8994
2727
- qcom,apss-wdt-qcm2290
2828
- qcom,apss-wdt-qcs404
29+
- qcom,apss-wdt-qcs615
30+
- qcom,apss-wdt-qcs8300
2931
- qcom,apss-wdt-sa8255p
3032
- qcom,apss-wdt-sa8775p
3133
- qcom,apss-wdt-sc7180

Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ properties:
2626
- samsung,exynos7-wdt # for Exynos7
2727
- samsung,exynos850-wdt # for Exynos850
2828
- samsung,exynosautov9-wdt # for Exynosautov9
29+
- samsung,exynosautov920-wdt # for Exynosautov920
2930
- items:
3031
- enum:
3132
- tesla,fsd-wdt
@@ -77,6 +78,7 @@ allOf:
7778
- samsung,exynos7-wdt
7879
- samsung,exynos850-wdt
7980
- samsung,exynosautov9-wdt
81+
- samsung,exynosautov920-wdt
8082
then:
8183
required:
8284
- samsung,syscon-phandle
@@ -88,6 +90,7 @@ allOf:
8890
- google,gs101-wdt
8991
- samsung,exynos850-wdt
9092
- samsung,exynosautov9-wdt
93+
- samsung,exynosautov920-wdt
9194
then:
9295
properties:
9396
clocks:

Documentation/watchdog/watchdog-parameters.rst

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,16 +120,6 @@ coh901327_wdt:
120120

121121
-------------------------------------------------
122122

123-
cpu5wdt:
124-
port:
125-
base address of watchdog card, default is 0x91
126-
verbose:
127-
be verbose, default is 0 (no)
128-
ticks:
129-
count down ticks, default is 10000
130-
131-
-------------------------------------------------
132-
133123
cpwd:
134124
wd0_timeout:
135125
Default watchdog0 timeout in 1/10secs

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22407,7 +22407,7 @@ F: drivers/char/hw_random/jh7110-trng.c
2240722407

2240822408
STARFIVE WATCHDOG DRIVER
2240922409
M: Xingyu Wu <xingyu.wu@starfivetech.com>
22410-
M: Samin Guo <samin.guo@starfivetech.com>
22410+
M: Ziv Xu <ziv.xu@starfivetech.com>
2241122411
S: Supported
2241222412
F: Documentation/devicetree/bindings/watchdog/starfive*
2241322413
F: drivers/watchdog/starfive-wdt.c

drivers/watchdog/Kconfig

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,14 @@ config SL28CPLD_WATCHDOG
408408

409409
# ARM Architecture
410410

411+
config AIROHA_WATCHDOG
412+
tristate "Airoha EN7581 Watchdog"
413+
depends on ARCH_AIROHA || COMPILE_TEST
414+
select WATCHDOG_CORE
415+
help
416+
Watchdog timer embedded into Airoha SoC. This will reboot your
417+
system when the timeout is reached.
418+
411419
config ARM_SP805_WATCHDOG
412420
tristate "ARM SP805 Watchdog"
413421
depends on (ARM || ARM64 || COMPILE_TEST) && ARM_AMBA
@@ -549,6 +557,7 @@ config S3C2410_WATCHDOG
549557
tristate "S3C6410/S5Pv210/Exynos Watchdog"
550558
depends on ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
551559
select WATCHDOG_CORE
560+
select MFD_SYSCON if ARCH_EXYNOS
552561
help
553562
Watchdog timer block in the Samsung S3C64xx, S5Pv210 and Exynos
554563
SoCs. This will reboot the system when the timer expires with
@@ -1543,14 +1552,6 @@ config SBC7240_WDT
15431552
To compile this driver as a module, choose M here: the
15441553
module will be called sbc7240_wdt.
15451554

1546-
config CPU5_WDT
1547-
tristate "SMA CPU5 Watchdog"
1548-
depends on (X86 || COMPILE_TEST) && HAS_IOPORT
1549-
help
1550-
TBD.
1551-
To compile this driver as a module, choose M here: the
1552-
module will be called cpu5wdt.
1553-
15541555
config SMSC_SCH311X_WDT
15551556
tristate "SMSC SCH311X Watchdog Timer"
15561557
depends on (X86 || COMPILE_TEST) && HAS_IOPORT

drivers/watchdog/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o
4040
obj-$(CONFIG_ARM_SP805_WATCHDOG) += sp805_wdt.o
4141
obj-$(CONFIG_ARM_SBSA_WATCHDOG) += sbsa_gwdt.o
4242
obj-$(CONFIG_ARMADA_37XX_WATCHDOG) += armada_37xx_wdt.o
43+
obj-$(CONFIG_AIROHA_WATCHDOG) += airoha_wdt.o
4344
obj-$(CONFIG_ASM9260_WATCHDOG) += asm9260_wdt.o
4445
obj-$(CONFIG_AT91RM9200_WATCHDOG) += at91rm9200_wdt.o
4546
obj-$(CONFIG_AT91SAM9X_WATCHDOG) += at91sam9_wdt.o
@@ -138,7 +139,6 @@ obj-$(CONFIG_RDC321X_WDT) += rdc321x_wdt.o
138139
obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
139140
obj-$(CONFIG_SBC8360_WDT) += sbc8360.o
140141
obj-$(CONFIG_SBC7240_WDT) += sbc7240_wdt.o
141-
obj-$(CONFIG_CPU5_WDT) += cpu5wdt.o
142142
obj-$(CONFIG_SMSC_SCH311X_WDT) += sch311x_wdt.o
143143
obj-$(CONFIG_SMSC37B787_WDT) += smsc37b787_wdt.o
144144
obj-$(CONFIG_TQMX86_WDT) += tqmx86_wdt.o

0 commit comments

Comments
 (0)