Skip to content

Commit 29057cc

Browse files
committed
Merge tag 'linux-watchdog-6.6-rc1' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck: - add marvell GTI watchdog driver - add support for Amlogic-T7 SoCs - document the IPQ5018 watchdog compatible - enable COMPILE_TEST for more watchdog device drivers - core: stop watchdog when executing poweroff command - other small improvements and fixes * tag 'linux-watchdog-6.6-rc1' of git://www.linux-watchdog.org/linux-watchdog: (21 commits) watchdog: Add support for Amlogic-T7 SoCs watchdog: Add a new struct for Amlogic-GXBB driver dt-bindings: watchdog: Add support for Amlogic-T7 SoCs dt-bindings: watchdog: qcom-wdt: document IPQ5018 watchdog: imx2_wdt: Improve dev_crit() message watchdog: stm32: Drop unnecessary of_match_ptr() watchdog: sama5d4: readout initial state watchdog: intel-mid_wdt: add MODULE_ALIAS() to allow auto-load watchdog: core: stop watchdog when executing poweroff command watchdog: pm8916_wdt: Remove redundant of_match_ptr() watchdog: xilinx_wwdt: Use div_u64() in xilinx_wwdt_start() watchdog: starfive: Remove #ifdef guards for PM related functions watchdog: s3c2410: Fix potential deadlock on &wdt->lock watchdog:rit_wdt: Add support for WDIOF_CARDRESET dt-bindings: watchdog: ti,rti-wdt: Add support for WDIOF_CARDRESET watchdog: Enable COMPILE_TEST for more drivers watchdog: advantech_ec_wdt: fix Kconfig dependencies watchdog: Explicitly include correct DT includes Watchdog: Add marvell GTI watchdog driver dt-bindings: watchdog: marvell GTI system watchdog driver ...
2 parents 57ac7ff + 8c776a0 commit 29057cc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+625
-101
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ properties:
1717
compatible:
1818
enum:
1919
- amlogic,meson-gxbb-wdt
20+
- amlogic,t7-wdt
2021

2122
reg:
2223
maxItems: 1
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/watchdog/marvell,cn10624-wdt.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Marvell Global Timer (GTI) system watchdog
8+
9+
maintainers:
10+
- Bharat Bhushan <bbhushan2@marvell.com>
11+
12+
allOf:
13+
- $ref: watchdog.yaml#
14+
15+
properties:
16+
compatible:
17+
oneOf:
18+
- enum:
19+
- marvell,cn9670-wdt
20+
- marvell,cn10624-wdt
21+
22+
- items:
23+
- enum:
24+
- marvell,cn9880-wdt
25+
- marvell,cnf9535-wdt
26+
- const: marvell,cn9670-wdt
27+
28+
- items:
29+
- enum:
30+
- marvell,cn10308-wdt
31+
- marvell,cnf10518-wdt
32+
- const: marvell,cn10624-wdt
33+
34+
reg:
35+
maxItems: 1
36+
37+
interrupts:
38+
maxItems: 1
39+
40+
clocks:
41+
maxItems: 1
42+
43+
clock-names:
44+
items:
45+
- const: refclk
46+
47+
marvell,wdt-timer-index:
48+
$ref: /schemas/types.yaml#/definitions/uint32
49+
minimum: 0
50+
maximum: 63
51+
description:
52+
An SoC have many timers (up to 64), firmware can reserve one or more timer
53+
for some other use case and configures one of the global timer as watchdog
54+
timer. Firmware will update this field with the timer number configured
55+
as watchdog timer.
56+
57+
required:
58+
- compatible
59+
- reg
60+
- interrupts
61+
- clocks
62+
- clock-names
63+
64+
unevaluatedProperties: false
65+
66+
examples:
67+
- |
68+
#include <dt-bindings/interrupt-controller/arm-gic.h>
69+
soc {
70+
#address-cells = <2>;
71+
#size-cells = <2>;
72+
73+
watchdog@802000040000 {
74+
compatible = "marvell,cn9670-wdt";
75+
reg = <0x00008020 0x00040000 0x00000000 0x00020000>;
76+
interrupts = <GIC_SPI 38 IRQ_TYPE_EDGE_RISING>;
77+
clocks = <&sclk>;
78+
clock-names = "refclk";
79+
marvell,wdt-timer-index = <63>;
80+
};
81+
};
82+
83+
...

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
- items:
1919
- enum:
2020
- qcom,kpss-wdt-ipq4019
21+
- qcom,apss-wdt-ipq5018
2122
- qcom,apss-wdt-ipq5332
2223
- qcom,apss-wdt-ipq9574
2324
- qcom,apss-wdt-msm8994

Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,20 @@ properties:
3434
power-domains:
3535
maxItems: 1
3636

37+
memory-region:
38+
maxItems: 1
39+
description:
40+
Contains the watchdog reserved memory. It is optional.
41+
In the reserved memory, the specified values, which are
42+
PON_REASON_SOF_NUM(0xBBBBCCCC), PON_REASON_MAGIC_NUM(0xDDDDDDDD),
43+
and PON_REASON_EOF_NUM(0xCCCCBBBB), are pre-stored at the first
44+
3 * 4 bytes to tell that last boot was caused by watchdog reset.
45+
Once the PON reason is captured by driver(rti_wdt.c), the driver
46+
is supposed to wipe the whole memory region. Surely, if this
47+
property is set, at least 12 bytes reserved memory starting from
48+
specific memory address(0xa220000) should be set. More please
49+
refer to example.
50+
3751
required:
3852
- compatible
3953
- reg
@@ -47,7 +61,18 @@ examples:
4761
/*
4862
* RTI WDT in main domain on J721e SoC. Assigned clocks are used to
4963
* select the source clock for the watchdog, forcing it to tick with
50-
* a 32kHz clock in this case.
64+
* a 32kHz clock in this case. Add a reserved memory(optional) to keep
65+
* the watchdog reset cause persistent, which was be written in 12 bytes
66+
* starting from 0xa2200000 by RTI Watchdog Firmware, then make it
67+
* possible to get watchdog reset cause in driver.
68+
*
69+
* Reserved memory should be defined as follows:
70+
* reserved-memory {
71+
* wdt_reset_memory_region: wdt-memory@a2200000 {
72+
* reg = <0x00 0xa2200000 0x00 0x1000>;
73+
* no-map;
74+
* };
75+
* }
5176
*/
5277
#include <dt-bindings/soc/ti,sci_pm_domain.h>
5378
@@ -58,4 +83,5 @@ examples:
5883
power-domains = <&k3_pds 252 TI_SCI_PD_EXCLUSIVE>;
5984
assigned-clocks = <&k3_clks 252 1>;
6085
assigned-clock-parents = <&k3_clks 252 5>;
86+
memory-region = <&wdt_reset_memory_region>;
6187
};

0 commit comments

Comments
 (0)