Merge tag 'linux-watchdog-5.4-rc1' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck: - addition of AST2600, i.MX7ULP and F81803 watchdog support - removal of the w90x900 and ks8695 drivers - ziirave_wdt improvements - small fixes and improvements * tag 'linux-watchdog-5.4-rc1' of git://www.linux-watchdog.org/linux-watchdog: (51 commits) watchdog: f71808e_wdt: Add F81803 support watchdog: qcom: remove unnecessary variable from private storage watchdog: qcom: support pre-timeout when the bark irq is available watchdog: imx_sc: this patch just fixes whitespaces watchdog: apseed: Add access_cs0 option for alt-boot watchdog: aspeed: add support for dual boot watchdog: orion_wdt: use timer1 as a pretimeout watchdog: Add i.MX7ULP watchdog support dt-bindings: watchdog: Add i.MX7ULP bindings dt-bindings: watchdog: sun4i: Add the watchdog clock dt-bindings: watchdog: sun4i: Add the watchdog interrupts dt-bindings: watchdog: Convert Allwinner watchdog to a schema dt-bindings: watchdog: Add YAML schemas for the generic watchdog bindings watchdog: aspeed: Add support for AST2600 dt-bindings: watchdog: Add ast2600 compatible watchdog: ziirave_wdt: Update checked I2C functionality mask watchdog: ziirave_wdt: Drop ziirave_firm_write_block_data() watchdog: ziirave_wdt: Fix DOWNLOAD_START payload watchdog: ziirave_wdt: Drop status polling code watchdog: ziirave_wdt: Fix RESET_PROCESSOR payload ...
This commit is contained in:
Linus Torvalds
@@ -72,3 +72,37 @@ Description:
|
||||
It is a read/write file. When read, the currently assigned
|
||||
pretimeout governor is returned. When written, it sets
|
||||
the pretimeout governor.
|
||||
|
||||
What: /sys/class/watchdog/watchdog1/access_cs0
|
||||
Date: August 2019
|
||||
Contact: Ivan Mikhaylov <i.mikhaylov@yadro.com>,
|
||||
Alexander Amelkin <a.amelkin@yadro.com>
|
||||
Description:
|
||||
It is a read/write file. This attribute exists only if the
|
||||
system has booted from the alternate flash chip due to
|
||||
expiration of a watchdog timer of AST2400/AST2500 when
|
||||
alternate boot function was enabled with 'aspeed,alt-boot'
|
||||
devicetree option for that watchdog or with an appropriate
|
||||
h/w strapping (for WDT2 only).
|
||||
|
||||
At alternate flash the 'access_cs0' sysfs node provides:
|
||||
ast2400: a way to get access to the primary SPI flash
|
||||
chip at CS0 after booting from the alternate
|
||||
chip at CS1.
|
||||
ast2500: a way to restore the normal address mapping
|
||||
from (CS0->CS1, CS1->CS0) to (CS0->CS0,
|
||||
CS1->CS1).
|
||||
|
||||
Clearing the boot code selection and timeout counter also
|
||||
resets to the initial state the chip select line mapping. When
|
||||
the SoC is in normal mapping state (i.e. booted from CS0),
|
||||
clearing those bits does nothing for both versions of the SoC.
|
||||
For alternate boot mode (booted from CS1 due to wdt2
|
||||
expiration) the behavior differs as described above.
|
||||
|
||||
This option can be used with wdt2 (watchdog1) only.
|
||||
|
||||
When read, the current status of the boot code selection is
|
||||
shown. When written with any non-zero value, it clears
|
||||
the boot code selection and the timeout counter, which results
|
||||
in chipselect reset for AST2400/AST2500.
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
%YAML 1.2
|
||||
---
|
||||
$id: http://devicetree.org/schemas/watchdog/allwinner,sun4i-a10-wdt.yaml#
|
||||
$schema: http://devicetree.org/meta-schemas/core.yaml#
|
||||
|
||||
title: Allwinner A10 Watchdog Device Tree Bindings
|
||||
|
||||
allOf:
|
||||
- $ref: "watchdog.yaml#"
|
||||
|
||||
maintainers:
|
||||
- Chen-Yu Tsai <wens@csie.org>
|
||||
- Maxime Ripard <maxime.ripard@bootlin.com>
|
||||
|
||||
properties:
|
||||
compatible:
|
||||
oneOf:
|
||||
- const: allwinner,sun4i-a10-wdt
|
||||
- const: allwinner,sun6i-a31-wdt
|
||||
- items:
|
||||
- const: allwinner,sun50i-a64-wdt
|
||||
- const: allwinner,sun6i-a31-wdt
|
||||
- items:
|
||||
- const: allwinner,sun50i-h6-wdt
|
||||
- const: allwinner,sun6i-a31-wdt
|
||||
- items:
|
||||
- const: allwinner,suniv-f1c100s-wdt
|
||||
- const: allwinner,sun4i-a10-wdt
|
||||
|
||||
reg:
|
||||
maxItems: 1
|
||||
|
||||
clocks:
|
||||
maxItems: 1
|
||||
|
||||
interrupts:
|
||||
maxItems: 1
|
||||
|
||||
required:
|
||||
- compatible
|
||||
- reg
|
||||
- clocks
|
||||
- interrupts
|
||||
|
||||
unevaluatedProperties: false
|
||||
|
||||
examples:
|
||||
- |
|
||||
wdt: watchdog@1c20c90 {
|
||||
compatible = "allwinner,sun4i-a10-wdt";
|
||||
reg = <0x01c20c90 0x10>;
|
||||
interrupts = <24>;
|
||||
clocks = <&osc24M>;
|
||||
timeout-sec = <10>;
|
||||
};
|
||||
|
||||
...
|
||||
@@ -4,6 +4,7 @@ Required properties:
|
||||
- compatible: must be one of:
|
||||
- "aspeed,ast2400-wdt"
|
||||
- "aspeed,ast2500-wdt"
|
||||
- "aspeed,ast2600-wdt"
|
||||
|
||||
- reg: physical base address of the controller and length of memory mapped
|
||||
region
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
* Freescale i.MX7ULP Watchdog Timer (WDT) Controller
|
||||
|
||||
Required properties:
|
||||
- compatible : Should be "fsl,imx7ulp-wdt"
|
||||
- reg : Should contain WDT registers location and length
|
||||
- interrupts : Should contain WDT interrupt
|
||||
- clocks: Should contain a phandle pointing to the gated peripheral clock.
|
||||
|
||||
Optional properties:
|
||||
- timeout-sec : Contains the watchdog timeout in seconds
|
||||
|
||||
Examples:
|
||||
|
||||
wdog1: watchdog@403d0000 {
|
||||
compatible = "fsl,imx7ulp-wdt";
|
||||
reg = <0x403d0000 0x10000>;
|
||||
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&pcc2 IMX7ULP_CLK_WDG1>;
|
||||
assigned-clocks = <&pcc2 IMX7ULP_CLK_WDG1>;
|
||||
assigned-clocks-parents = <&scg1 IMX7ULP_CLK_FIRC_BUS_CLK>;
|
||||
timeout-sec = <40>;
|
||||
};
|
||||
@@ -1,22 +0,0 @@
|
||||
Allwinner SoCs Watchdog timer
|
||||
|
||||
Required properties:
|
||||
|
||||
- compatible : should be one of
|
||||
"allwinner,sun4i-a10-wdt"
|
||||
"allwinner,sun6i-a31-wdt"
|
||||
"allwinner,sun50i-a64-wdt","allwinner,sun6i-a31-wdt"
|
||||
"allwinner,sun50i-h6-wdt","allwinner,sun6i-a31-wdt"
|
||||
"allwinner,suniv-f1c100s-wdt", "allwinner,sun4i-a10-wdt"
|
||||
- reg : Specifies base physical address and size of the registers.
|
||||
|
||||
Optional properties:
|
||||
- timeout-sec : Contains the watchdog timeout in seconds
|
||||
|
||||
Example:
|
||||
|
||||
wdt: watchdog@1c20c90 {
|
||||
compatible = "allwinner,sun4i-a10-wdt";
|
||||
reg = <0x01c20c90 0x10>;
|
||||
timeout-sec = <10>;
|
||||
};
|
||||
26
Documentation/devicetree/bindings/watchdog/watchdog.yaml
Normal file
26
Documentation/devicetree/bindings/watchdog/watchdog.yaml
Normal file
@@ -0,0 +1,26 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
%YAML 1.2
|
||||
---
|
||||
$id: http://devicetree.org/schemas/watchdog/watchdog.yaml#
|
||||
$schema: http://devicetree.org/meta-schemas/core.yaml#
|
||||
|
||||
title: Watchdog Generic Bindings
|
||||
|
||||
maintainers:
|
||||
- Guenter Roeck <linux@roeck-us.net>
|
||||
- Wim Van Sebroeck <wim@linux-watchdog.org>
|
||||
|
||||
description: |
|
||||
This document describes generic bindings which can be used to
|
||||
describe watchdog devices in a device tree.
|
||||
|
||||
properties:
|
||||
$nodename:
|
||||
pattern: "^watchdog(@.*|-[0-9a-f])?$"
|
||||
|
||||
timeout-sec:
|
||||
$ref: /schemas/types.yaml#/definitions/uint32
|
||||
description:
|
||||
Contains the watchdog timeout in seconds.
|
||||
|
||||
...
|
||||
@@ -301,15 +301,6 @@ ixp4xx_wdt:
|
||||
|
||||
-------------------------------------------------
|
||||
|
||||
ks8695_wdt:
|
||||
wdt_time:
|
||||
Watchdog time in seconds. (default=5)
|
||||
nowayout:
|
||||
Watchdog cannot be stopped once started
|
||||
(default=kernel config parameter)
|
||||
|
||||
-------------------------------------------------
|
||||
|
||||
machzwd:
|
||||
nowayout:
|
||||
Watchdog cannot be stopped once started
|
||||
@@ -375,16 +366,6 @@ nic7018_wdt:
|
||||
|
||||
-------------------------------------------------
|
||||
|
||||
nuc900_wdt:
|
||||
heartbeat:
|
||||
Watchdog heartbeats in seconds.
|
||||
(default = 15)
|
||||
nowayout:
|
||||
Watchdog cannot be stopped once started
|
||||
(default=kernel config parameter)
|
||||
|
||||
-------------------------------------------------
|
||||
|
||||
omap_wdt:
|
||||
timer_margin:
|
||||
initial watchdog timeout (in seconds)
|
||||
|
||||
Reference in New Issue
Block a user