Two conversions to DT schema of GPIO watchdog binding happened and came
through different trees. Merge them into one:
1. Combine maintainers,
2. Use more descriptive property descriptions and constraints from
gpio-wdt.yaml,
3. Switch to unevaluatedProperties:false, to allow generic watchdog
properties.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
.../bindings/watchdog/gpio-wdt.yaml | 55 -------------------
.../bindings/watchdog/linux,wdt-gpio.yaml | 17 +++++-
2 files changed, 15 insertions(+), 57 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml
diff --git a/Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml b/Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml
deleted file mode 100644
index 155dc7965e9b..000000000000
--- a/Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-%YAML 1.2
----
-$id: http://devicetree.org/schemas/watchdog/gpio-wdt.yaml#
-$schema: http://devicetree.org/meta-schemas/core.yaml#
-
-title: GPIO controlled watchdog
-
-maintainers:
- - Robert Marko <[email protected]>
-
-properties:
- compatible:
- const: linux,wdt-gpio
-
- gpios:
- maxItems: 1
- description: GPIO connected to the WDT reset pin
-
- hw_algo:
- $ref: /schemas/types.yaml#/definitions/string
- description: Algorithm used by the driver
- oneOf:
- - description:
- Either a high-to-low or a low-to-high transition clears the WDT counter.
- The watchdog timer is disabled when GPIO is left floating or connected
- to a three-state buffer.
- const: toggle
- - description:
- Low or high level starts counting WDT timeout, the opposite level
- disables the WDT.
- Active level is determined by the GPIO flags.
- const: level
-
- hw_margin_ms:
- $ref: /schemas/types.yaml#/definitions/uint32
- description: Maximum time to reset watchdog circuit (in milliseconds)
- minimum: 2
- maximum: 65535
-
- always-running:
- type: boolean
- description:
- If the watchdog timer cannot be disabled, add this flag to have the driver
- keep toggling the signal without a client.
- It will only cease to toggle the signal when the device is open and the
- timeout elapsed.
-
-required:
- - compatible
- - gpios
- - hw_algo
- - hw_margin_ms
-
-unevaluatedProperties: false
diff --git a/Documentation/devicetree/bindings/watchdog/linux,wdt-gpio.yaml b/Documentation/devicetree/bindings/watchdog/linux,wdt-gpio.yaml
index 50af79af6416..499f1b7e03f9 100644
--- a/Documentation/devicetree/bindings/watchdog/linux,wdt-gpio.yaml
+++ b/Documentation/devicetree/bindings/watchdog/linux,wdt-gpio.yaml
@@ -8,6 +8,7 @@ title: GPIO-controlled Watchdog
maintainers:
- Guenter Roeck <[email protected]>
+ - Robert Marko <[email protected]>
properties:
compatible:
@@ -19,11 +20,23 @@ properties:
hw_algo:
description: The algorithm used by the driver.
- enum: [ level, toggle ]
+ oneOf:
+ - description:
+ Either a high-to-low or a low-to-high transition clears the WDT counter.
+ The watchdog timer is disabled when GPIO is left floating or connected
+ to a three-state buffer.
+ const: toggle
+ - description:
+ Low or high level starts counting WDT timeout, the opposite level
+ disables the WDT.
+ Active level is determined by the GPIO flags.
+ const: level
hw_margin_ms:
description: Maximum time to reset watchdog circuit (milliseconds).
$ref: /schemas/types.yaml#/definitions/uint32
+ minimum: 2
+ maximum: 65535
always-running:
type: boolean
@@ -42,7 +55,7 @@ required:
allOf:
- $ref: watchdog.yaml#
-additionalProperties: false
+unevaluatedProperties: false
examples:
- |
--
2.34.1
Minor cleanup without functional impact:
1. Indent DTS examples to preferred four-spaces (more readable for DTS),
2. Drop unneeded quotes,
3. Add/drop blank lines to make the code readable.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
.../watchdog/amlogic,meson-gxbb-wdt.yaml | 10 +++---
.../bindings/watchdog/arm,sbsa-gwdt.yaml | 1 -
.../bindings/watchdog/arm,twd-wdt.yaml | 6 ++--
.../bindings/watchdog/arm-smc-wdt.yaml | 7 ++--
.../bindings/watchdog/atmel,sama5d4-wdt.yaml | 14 ++++----
.../bindings/watchdog/brcm,bcm7038-wdt.yaml | 6 ++--
.../bindings/watchdog/faraday,ftwdt010.yaml | 16 +++++-----
.../watchdog/mediatek,mt7621-wdt.yaml | 6 ++--
.../bindings/watchdog/qcom-wdt.yaml | 32 +++++++++----------
.../bindings/watchdog/renesas,wdt.yaml | 14 ++++----
.../bindings/watchdog/snps,dw-wdt.yaml | 32 +++++++++----------
.../bindings/watchdog/st,stm32-iwdg.yaml | 10 +++---
.../watchdog/xlnx,xps-timebase-wdt.yaml | 12 +++----
13 files changed, 83 insertions(+), 83 deletions(-)
diff --git a/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml b/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml
index 497d60408ea0..f5cc7aa1b93b 100644
--- a/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml
@@ -2,8 +2,8 @@
# Copyright 2019 BayLibre, SAS
%YAML 1.2
---
-$id: "http://devicetree.org/schemas/watchdog/amlogic,meson-gxbb-wdt.yaml#"
-$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+$id: http://devicetree.org/schemas/watchdog/amlogic,meson-gxbb-wdt.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
title: Meson GXBB SoCs Watchdog timer
@@ -36,7 +36,7 @@ unevaluatedProperties: false
examples:
- |
watchdog@98d0 {
- compatible = "amlogic,meson-gxbb-wdt";
- reg = <0x98d0 0x10>;
- clocks = <&xtal>;
+ compatible = "amlogic,meson-gxbb-wdt";
+ reg = <0x98d0 0x10>;
+ clocks = <&xtal>;
};
diff --git a/Documentation/devicetree/bindings/watchdog/arm,sbsa-gwdt.yaml b/Documentation/devicetree/bindings/watchdog/arm,sbsa-gwdt.yaml
index 6bfa46353c4e..aa804f96acba 100644
--- a/Documentation/devicetree/bindings/watchdog/arm,sbsa-gwdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/arm,sbsa-gwdt.yaml
@@ -40,7 +40,6 @@ unevaluatedProperties: false
examples:
- |
-
watchdog@2a440000 {
compatible = "arm,sbsa-gwdt";
reg = <0x2a440000 0x1000>,
diff --git a/Documentation/devicetree/bindings/watchdog/arm,twd-wdt.yaml b/Documentation/devicetree/bindings/watchdog/arm,twd-wdt.yaml
index bb8901854222..9646ac72051e 100644
--- a/Documentation/devicetree/bindings/watchdog/arm,twd-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/arm,twd-wdt.yaml
@@ -44,7 +44,7 @@ examples:
#include <dt-bindings/interrupt-controller/arm-gic.h>
watchdog@2c000620 {
- compatible = "arm,arm11mp-twd-wdt";
- reg = <0x2c000620 0x20>;
- interrupts = <GIC_PPI 14 0xf01>;
+ compatible = "arm,arm11mp-twd-wdt";
+ reg = <0x2c000620 0x20>;
+ interrupts = <GIC_PPI 14 0xf01>;
};
diff --git a/Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml b/Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml
index fa05d6252982..b5573852ef5a 100644
--- a/Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml
@@ -16,6 +16,7 @@ properties:
compatible:
enum:
- arm,smc-wdt
+
arm,smc-id:
$ref: /schemas/types.yaml#/definitions/uint32
description: |
@@ -30,9 +31,9 @@ unevaluatedProperties: false
examples:
- |
watchdog {
- compatible = "arm,smc-wdt";
- arm,smc-id = <0x82003D06>;
- timeout-sec = <15>;
+ compatible = "arm,smc-wdt";
+ arm,smc-id = <0x82003D06>;
+ timeout-sec = <15>;
};
...
diff --git a/Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml b/Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml
index b28f7b57c36b..816f85ee2c77 100644
--- a/Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml
@@ -65,13 +65,13 @@ examples:
#include <dt-bindings/interrupt-controller/irq.h>
watchdog@fc068640 {
- compatible = "atmel,sama5d4-wdt";
- reg = <0xfc068640 0x10>;
- interrupts = <4 IRQ_TYPE_LEVEL_HIGH 5>;
- timeout-sec = <10>;
- atmel,watchdog-type = "hardware";
- atmel,dbg-halt;
- atmel,idle-halt;
+ compatible = "atmel,sama5d4-wdt";
+ reg = <0xfc068640 0x10>;
+ interrupts = <4 IRQ_TYPE_LEVEL_HIGH 5>;
+ timeout-sec = <10>;
+ atmel,watchdog-type = "hardware";
+ atmel,dbg-halt;
+ atmel,idle-halt;
};
...
diff --git a/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml b/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml
index 428004e7f0c3..526ff908d134 100644
--- a/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml
@@ -37,7 +37,7 @@ required:
examples:
- |
watchdog@f040a7e8 {
- compatible = "brcm,bcm7038-wdt";
- reg = <0xf040a7e8 0x16>;
- clocks = <&upg_fixed>;
+ compatible = "brcm,bcm7038-wdt";
+ reg = <0xf040a7e8 0x16>;
+ clocks = <&upg_fixed>;
};
diff --git a/Documentation/devicetree/bindings/watchdog/faraday,ftwdt010.yaml b/Documentation/devicetree/bindings/watchdog/faraday,ftwdt010.yaml
index 6e135f48b3ba..726dc872ad02 100644
--- a/Documentation/devicetree/bindings/watchdog/faraday,ftwdt010.yaml
+++ b/Documentation/devicetree/bindings/watchdog/faraday,ftwdt010.yaml
@@ -52,16 +52,16 @@ examples:
- |
#include <dt-bindings/interrupt-controller/irq.h>
watchdog@41000000 {
- compatible = "faraday,ftwdt010";
- reg = <0x41000000 0x1000>;
- interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
- timeout-sec = <5>;
+ compatible = "faraday,ftwdt010";
+ reg = <0x41000000 0x1000>;
+ interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
+ timeout-sec = <5>;
};
- |
watchdog: watchdog@98500000 {
- compatible = "moxa,moxart-watchdog", "faraday,ftwdt010";
- reg = <0x98500000 0x10>;
- clocks = <&clk_apb>;
- clock-names = "PCLK";
+ compatible = "moxa,moxart-watchdog", "faraday,ftwdt010";
+ reg = <0x98500000 0x10>;
+ clocks = <&clk_apb>;
+ clock-names = "PCLK";
};
...
diff --git a/Documentation/devicetree/bindings/watchdog/mediatek,mt7621-wdt.yaml b/Documentation/devicetree/bindings/watchdog/mediatek,mt7621-wdt.yaml
index a668d0c2f14b..18160869c378 100644
--- a/Documentation/devicetree/bindings/watchdog/mediatek,mt7621-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/mediatek,mt7621-wdt.yaml
@@ -34,7 +34,7 @@ additionalProperties: false
examples:
- |
watchdog@100 {
- compatible = "mediatek,mt7621-wdt";
- reg = <0x100 0x100>;
- mediatek,sysctl = <&sysc>;
+ compatible = "mediatek,mt7621-wdt";
+ reg = <0x100 0x100>;
+ mediatek,sysctl = <&sysc>;
};
diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
index 6448b633c970..eccfd23c50f4 100644
--- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
@@ -113,26 +113,26 @@ examples:
#include <dt-bindings/interrupt-controller/arm-gic.h>
watchdog@17c10000 {
- compatible = "qcom,apss-wdt-sm8150", "qcom,kpss-wdt";
- reg = <0x17c10000 0x1000>;
- clocks = <&sleep_clk>;
- interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
- timeout-sec = <10>;
+ compatible = "qcom,apss-wdt-sm8150", "qcom,kpss-wdt";
+ reg = <0x17c10000 0x1000>;
+ clocks = <&sleep_clk>;
+ interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
+ timeout-sec = <10>;
};
- |
#include <dt-bindings/interrupt-controller/arm-gic.h>
watchdog@200a000 {
- compatible = "qcom,kpss-wdt-ipq8064", "qcom,kpss-timer", "qcom,msm-timer";
- interrupts = <GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>,
- <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>,
- <GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>,
- <GIC_PPI 4 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>,
- <GIC_PPI 5 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>;
- reg = <0x0200a000 0x100>;
- clock-frequency = <25000000>;
- clocks = <&sleep_clk>;
- clock-names = "sleep";
- cpu-offset = <0x80000>;
+ compatible = "qcom,kpss-wdt-ipq8064", "qcom,kpss-timer", "qcom,msm-timer";
+ interrupts = <GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>,
+ <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>,
+ <GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>,
+ <GIC_PPI 4 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>,
+ <GIC_PPI 5 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>;
+ reg = <0x0200a000 0x100>;
+ clock-frequency = <25000000>;
+ clocks = <&sleep_clk>;
+ clock-names = "sleep";
+ cpu-offset = <0x80000>;
};
diff --git a/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml b/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml
index 50c5c48ee6fb..951a7d54135a 100644
--- a/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml
@@ -177,11 +177,11 @@ examples:
#include <dt-bindings/power/r8a7795-sysc.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
wdt0: watchdog@e6020000 {
- compatible = "renesas,r8a7795-wdt", "renesas,rcar-gen3-wdt";
- reg = <0xe6020000 0x0c>;
- interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&cpg CPG_MOD 402>;
- power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
- resets = <&cpg 402>;
- timeout-sec = <60>;
+ compatible = "renesas,r8a7795-wdt", "renesas,rcar-gen3-wdt";
+ reg = <0xe6020000 0x0c>;
+ interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cpg CPG_MOD 402>;
+ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+ resets = <&cpg 402>;
+ timeout-sec = <60>;
};
diff --git a/Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml b/Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml
index 39139586611b..76eceeddd150 100644
--- a/Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml
@@ -83,25 +83,25 @@ required:
examples:
- |
watchdog@ffd02000 {
- compatible = "snps,dw-wdt";
- reg = <0xffd02000 0x1000>;
- interrupts = <0 171 4>;
- clocks = <&per_base_clk>;
- resets = <&wdt_rst>;
+ compatible = "snps,dw-wdt";
+ reg = <0xffd02000 0x1000>;
+ interrupts = <0 171 4>;
+ clocks = <&per_base_clk>;
+ resets = <&wdt_rst>;
};
- |
watchdog@ffd02000 {
- compatible = "snps,dw-wdt";
- reg = <0xffd02000 0x1000>;
- interrupts = <0 171 4>;
- clocks = <&per_base_clk>;
- clock-names = "tclk";
- snps,watchdog-tops = <0x000000FF 0x000001FF 0x000003FF
- 0x000007FF 0x0000FFFF 0x0001FFFF
- 0x0003FFFF 0x0007FFFF 0x000FFFFF
- 0x001FFFFF 0x003FFFFF 0x007FFFFF
- 0x00FFFFFF 0x01FFFFFF 0x03FFFFFF
- 0x07FFFFFF>;
+ compatible = "snps,dw-wdt";
+ reg = <0xffd02000 0x1000>;
+ interrupts = <0 171 4>;
+ clocks = <&per_base_clk>;
+ clock-names = "tclk";
+ snps,watchdog-tops = <0x000000FF 0x000001FF 0x000003FF
+ 0x000007FF 0x0000FFFF 0x0001FFFF
+ 0x0003FFFF 0x0007FFFF 0x000FFFFF
+ 0x001FFFFF 0x003FFFFF 0x007FFFFF
+ 0x00FFFFFF 0x01FFFFFF 0x03FFFFFF
+ 0x07FFFFFF>;
};
...
diff --git a/Documentation/devicetree/bindings/watchdog/st,stm32-iwdg.yaml b/Documentation/devicetree/bindings/watchdog/st,stm32-iwdg.yaml
index 2cb1a2ed0f7b..6b13bfc11e11 100644
--- a/Documentation/devicetree/bindings/watchdog/st,stm32-iwdg.yaml
+++ b/Documentation/devicetree/bindings/watchdog/st,stm32-iwdg.yaml
@@ -48,11 +48,11 @@ examples:
- |
#include <dt-bindings/clock/stm32mp1-clks.h>
watchdog@5a002000 {
- compatible = "st,stm32mp1-iwdg";
- reg = <0x5a002000 0x400>;
- clocks = <&rcc IWDG2>, <&rcc CK_LSI>;
- clock-names = "pclk", "lsi";
- timeout-sec = <32>;
+ compatible = "st,stm32mp1-iwdg";
+ reg = <0x5a002000 0x400>;
+ clocks = <&rcc IWDG2>, <&rcc CK_LSI>;
+ clock-names = "pclk", "lsi";
+ timeout-sec = <32>;
};
...
diff --git a/Documentation/devicetree/bindings/watchdog/xlnx,xps-timebase-wdt.yaml b/Documentation/devicetree/bindings/watchdog/xlnx,xps-timebase-wdt.yaml
index 493a1c954707..8444c56dd602 100644
--- a/Documentation/devicetree/bindings/watchdog/xlnx,xps-timebase-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/xlnx,xps-timebase-wdt.yaml
@@ -58,11 +58,11 @@ unevaluatedProperties: false
examples:
- |
watchdog@40100000 {
- compatible = "xlnx,xps-timebase-wdt-1.00.a";
- reg = <0x40100000 0x1000>;
- clock-frequency = <50000000>;
- clocks = <&clkc 15>;
- xlnx,wdt-enable-once = <0x0>;
- xlnx,wdt-interval = <0x1b>;
+ compatible = "xlnx,xps-timebase-wdt-1.00.a";
+ reg = <0x40100000 0x1000>;
+ clock-frequency = <50000000>;
+ clocks = <&clkc 15>;
+ xlnx,wdt-enable-once = <0x0>;
+ xlnx,wdt-interval = <0x1b>;
};
...
--
2.34.1
Allow generic watchdog properties by using unevaluatedProperties: false.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
.../devicetree/bindings/watchdog/fsl-imx7ulp-wdt.yaml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.yaml b/Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.yaml
index d3790f1a96a2..4b7ed1355701 100644
--- a/Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.yaml
@@ -30,15 +30,13 @@ properties:
clocks:
maxItems: 1
- timeout-sec: true
-
required:
- compatible
- interrupts
- reg
- clocks
-additionalProperties: false
+unevaluatedProperties: false
examples:
- |
--
2.34.1
Allow generic watchdog properties by using unevaluatedProperties: false.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
.../devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml b/Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
index eba083822d1f..51d03d5b08ad 100644
--- a/Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
@@ -24,14 +24,12 @@ properties:
clocks:
maxItems: 1
- timeout-sec: true
-
required:
- compatible
- reg
- clocks
-additionalProperties: false
+unevaluatedProperties: false
examples:
- |
--
2.34.1
There is no need to specify minItems when they are equal to maxItems,
because it is implied by maxItems.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
Documentation/devicetree/bindings/watchdog/arm,sp805.yaml | 1 -
1 file changed, 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/watchdog/arm,sp805.yaml b/Documentation/devicetree/bindings/watchdog/arm,sp805.yaml
index a69cac8ec208..7aea255b301b 100644
--- a/Documentation/devicetree/bindings/watchdog/arm,sp805.yaml
+++ b/Documentation/devicetree/bindings/watchdog/arm,sp805.yaml
@@ -43,7 +43,6 @@ properties:
Clocks driving the watchdog timer hardware. The first clock is used
for the actual watchdog counter. The second clock drives the register
interface.
- minItems: 2
maxItems: 2
clock-names:
--
2.34.1
Required properties should be listed in "required:" block. Since
interrupts are already there, the dependency of interrupt-names on the
interrupts can be simplified.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
.../devicetree/bindings/watchdog/realtek,otto-wdt.yaml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/watchdog/realtek,otto-wdt.yaml b/Documentation/devicetree/bindings/watchdog/realtek,otto-wdt.yaml
index 099245fe7b10..1f5390a67cdb 100644
--- a/Documentation/devicetree/bindings/watchdog/realtek,otto-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/realtek,otto-wdt.yaml
@@ -67,12 +67,10 @@ required:
- reg
- clocks
- interrupts
+ - interrupt-names
unevaluatedProperties: false
-dependencies:
- interrupts: [ interrupt-names ]
-
examples:
- |
watchdog: watchdog@3150 {
--
2.34.1
On Sat, Apr 15, 2023 at 11:58 AM Krzysztof Kozlowski
<[email protected]> wrote:
>
> Minor cleanup without functional impact:
> 1. Indent DTS examples to preferred four-spaces (more readable for DTS),
> 2. Drop unneeded quotes,
> 3. Add/drop blank lines to make the code readable.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> .../watchdog/mediatek,mt7621-wdt.yaml | 6 ++--
Acked-by: Sergio Paracuellos <[email protected]>
Thanks,
Sergio Paracuellos
On 4/15/2023 2:51 AM, Krzysztof Kozlowski wrote:
> Minor cleanup without functional impact:
> 1. Indent DTS examples to preferred four-spaces (more readable for DTS),
> 2. Drop unneeded quotes,
> 3. Add/drop blank lines to make the code readable.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> .../bindings/watchdog/brcm,bcm7038-wdt.yaml | 6 ++--
Acked-by: Justin Chen <[email protected]>
Justin
On 4/15/23 02:51, Krzysztof Kozlowski wrote:
> Two conversions to DT schema of GPIO watchdog binding happened and came
> through different trees. Merge them into one:
> 1. Combine maintainers,
> 2. Use more descriptive property descriptions and constraints from
> gpio-wdt.yaml,
> 3. Switch to unevaluatedProperties:false, to allow generic watchdog
> properties.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
For the series:
Reviewed-by: Guenter Roeck <[email protected]>
On a side note, the e-mail addresses in patchwork are messed up for
patches sent by you. As result, I can not reply to your e-mails after
pulling a patch from patchwork. This means that some replies get lost
if I did not keep the original e-mail.
That is how it looks like after I pull one of your patches from patchwork:
To:
+=?unknown-8bit?q?Wim_Van_Sebroeck_=3Cwim=40linux-watchdog=2Eorg=3E=2C_Gu?==?unknown-8bit?q?enter_Roeck_=3Clinux=40roeck-us=2Enet=3E=2C_Rob_Herring_?==?unknown-8bit?q?=3Crobh+dt=40kernel=2Eorg=3E=2C_Krzysztof_Kozlowski_=3Ckrz?==?unknown-8bit?q?yszt
+of=2Ekozlowski+dt=40linaro=2Eorg=3E=2C_Neil_Armstrong_?==?unknown-8bit?q?=3Cneil=2Earmstrong=40linaro=2Eorg=3E=2C_Kevin_Hilman_=3Ck?==?unknown-8bit?q?hilman=40baylibre=2Ecom=3E=2C_Jerome_Brunet_=3Cjbrunet=40b?==?unknown-8bit?q?aylibre=2Ecom=3E=2C_
+Martin_Blumenstingl_=3Cmartin=2Eblumen?==?unknown-8bit?q?stingl=40googlemail=2Ecom=3E=2C_Julius_Werner_=3Cjwerner?==?unknown-8bit?q?=40chromium=2Eorg=3E=2C_Evan_Benn_=3Cevanbenn=40chromium?==?unknown-8bit?q?=2Eorg=3E=2C_Nicolas_Ferre_=3Cnicolas=2E
+ferre=40microchip?==?unknown-8bit?q?=2Ecom=3E=2C_Alexandre_Belloni_=3Calexandre=2Ebelloni=40bo?==?unknown-8bit?q?otlin=2Ecom=3E=2C_Claudiu_Beznea_=3Cclaudiu=2Ebeznea=40mic?==?unknown-8bit?q?rochip=2Ecom=3E=2C_Florian_Fainelli_=3Cf=2Efainelli=40gma
+i?==?unknown-8bit?q?l=
Guenter
> ---
> .../bindings/watchdog/gpio-wdt.yaml | 55 -------------------
> .../bindings/watchdog/linux,wdt-gpio.yaml | 17 +++++-
> 2 files changed, 15 insertions(+), 57 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml
>
> diff --git a/Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml b/Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml
> deleted file mode 100644
> index 155dc7965e9b..000000000000
> --- a/Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml
> +++ /dev/null
> @@ -1,55 +0,0 @@
> -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> -%YAML 1.2
> ----
> -$id: http://devicetree.org/schemas/watchdog/gpio-wdt.yaml#
> -$schema: http://devicetree.org/meta-schemas/core.yaml#
> -
> -title: GPIO controlled watchdog
> -
> -maintainers:
> - - Robert Marko <[email protected]>
> -
> -properties:
> - compatible:
> - const: linux,wdt-gpio
> -
> - gpios:
> - maxItems: 1
> - description: GPIO connected to the WDT reset pin
> -
> - hw_algo:
> - $ref: /schemas/types.yaml#/definitions/string
> - description: Algorithm used by the driver
> - oneOf:
> - - description:
> - Either a high-to-low or a low-to-high transition clears the WDT counter.
> - The watchdog timer is disabled when GPIO is left floating or connected
> - to a three-state buffer.
> - const: toggle
> - - description:
> - Low or high level starts counting WDT timeout, the opposite level
> - disables the WDT.
> - Active level is determined by the GPIO flags.
> - const: level
> -
> - hw_margin_ms:
> - $ref: /schemas/types.yaml#/definitions/uint32
> - description: Maximum time to reset watchdog circuit (in milliseconds)
> - minimum: 2
> - maximum: 65535
> -
> - always-running:
> - type: boolean
> - description:
> - If the watchdog timer cannot be disabled, add this flag to have the driver
> - keep toggling the signal without a client.
> - It will only cease to toggle the signal when the device is open and the
> - timeout elapsed.
> -
> -required:
> - - compatible
> - - gpios
> - - hw_algo
> - - hw_margin_ms
> -
> -unevaluatedProperties: false
> diff --git a/Documentation/devicetree/bindings/watchdog/linux,wdt-gpio.yaml b/Documentation/devicetree/bindings/watchdog/linux,wdt-gpio.yaml
> index 50af79af6416..499f1b7e03f9 100644
> --- a/Documentation/devicetree/bindings/watchdog/linux,wdt-gpio.yaml
> +++ b/Documentation/devicetree/bindings/watchdog/linux,wdt-gpio.yaml
> @@ -8,6 +8,7 @@ title: GPIO-controlled Watchdog
>
> maintainers:
> - Guenter Roeck <[email protected]>
> + - Robert Marko <[email protected]>
>
> properties:
> compatible:
> @@ -19,11 +20,23 @@ properties:
>
> hw_algo:
> description: The algorithm used by the driver.
> - enum: [ level, toggle ]
> + oneOf:
> + - description:
> + Either a high-to-low or a low-to-high transition clears the WDT counter.
> + The watchdog timer is disabled when GPIO is left floating or connected
> + to a three-state buffer.
> + const: toggle
> + - description:
> + Low or high level starts counting WDT timeout, the opposite level
> + disables the WDT.
> + Active level is determined by the GPIO flags.
> + const: level
>
> hw_margin_ms:
> description: Maximum time to reset watchdog circuit (milliseconds).
> $ref: /schemas/types.yaml#/definitions/uint32
> + minimum: 2
> + maximum: 65535
>
> always-running:
> type: boolean
> @@ -42,7 +55,7 @@ required:
> allOf:
> - $ref: watchdog.yaml#
>
> -additionalProperties: false
> +unevaluatedProperties: false
>
> examples:
> - |
On 16/04/2023 18:04, Guenter Roeck wrote:
> On 4/15/23 02:51, Krzysztof Kozlowski wrote:
>> Two conversions to DT schema of GPIO watchdog binding happened and came
>> through different trees. Merge them into one:
>> 1. Combine maintainers,
>> 2. Use more descriptive property descriptions and constraints from
>> gpio-wdt.yaml,
>> 3. Switch to unevaluatedProperties:false, to allow generic watchdog
>> properties.
>>
>> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>
>
> For the series:
>
> Reviewed-by: Guenter Roeck <[email protected]>
>
> On a side note, the e-mail addresses in patchwork are messed up for
> patches sent by you. As result, I can not reply to your e-mails after
> pulling a patch from patchwork. This means that some replies get lost
> if I did not keep the original e-mail.
>
> That is how it looks like after I pull one of your patches from patchwork:
>
> To:
> +=?unknown-8bit?q?Wim_Van_Sebroeck_=3Cwim=40linux-watchdog=2Eorg=3E=2C_Gu?==?unknown-8bit?q?enter_Roeck_=3Clinux=40roeck-us=2Enet=3E=2C_Rob_Herring_?==?unknown-8bit?q?=3Crobh+dt=40kernel=2Eorg=3E=2C_Krzysztof_Kozlowski_=3Ckrz?==?unknown-8bit?q?yszt
(Trimmed cc list)
Thanks for letting me know, I wonder what's the problem. I am sending
with send-email exactly the same way every day, but somehow this series
have such header in Patchwork:
https://patchwork.kernel.org/project/linux-watchdog/patch/[email protected]/
Which I do not see in:
1. lore:
https://lore.kernel.org/all/[email protected]/
2. Previous patches on Patchwork:
https://patchwork.kernel.org/project/linux-watchdog/patch/[email protected]/
Lore (1 above) points to possible unescaped UTF character for
[email protected], but I wonder why send-email did not handle it.
Best regards,
Krzysztof
Hi Krzysztof,
On Sat, 2023-04-15 at 11:51 +0200, Krzysztof Kozlowski wrote:
> Required properties should be listed in "required:" block. Since
> interrupts are already there, the dependency of interrupt-names on the
> interrupts can be simplified.
Maybe I'm not reading this right, but isn't the dependency stated in the binding
"interrupts requires interrupt-names to be present"? resource-names.txt
describes the reverse dependency ("interrupt-names is only meaningful with an
associated interrupts").
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
In any case, I'm OK with a flattened requirements list:
Acked-by: Sander Vanheule <[email protected]>
Best,
Sander
> Subject: [PATCH 5/6] dt-bindings: watchdog: toshiba,visconti-wdt: simplify
> with unevaluatedProperties
>
> Allow generic watchdog properties by using unevaluatedProperties: false.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> .../devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
Acked-by: Nobuhiro Iwamatsu <[email protected]>
Best regards,
Nobuhiro
>
> diff --git
> a/Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
> b/Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
> index eba083822d1f..51d03d5b08ad 100644
> ---
> a/Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
> +++
> b/Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
> @@ -24,14 +24,12 @@ properties:
> clocks:
> maxItems: 1
>
> - timeout-sec: true
> -
> required:
> - compatible
> - reg
> - clocks
>
> -additionalProperties: false
> +unevaluatedProperties: false
>
> examples:
> - |
> --
> 2.34.1
On Sat, Apr 15, 2023 at 11:51:08AM +0200, Krzysztof Kozlowski wrote:
> Minor cleanup without functional impact:
> 1. Indent DTS examples to preferred four-spaces (more readable for DTS),
> 2. Drop unneeded quotes,
> 3. Add/drop blank lines to make the code readable.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
Reviewed-by: Wolfram Sang <[email protected]> # for Renesas WDT
On 16/04/2023 21:00, Sander Vanheule wrote:
> Hi Krzysztof,
>
> On Sat, 2023-04-15 at 11:51 +0200, Krzysztof Kozlowski wrote:
>> Required properties should be listed in "required:" block. Since
>> interrupts are already there, the dependency of interrupt-names on the
>> interrupts can be simplified.
>
> Maybe I'm not reading this right, but isn't the dependency stated in the binding
> "interrupts requires interrupt-names to be present"? resource-names.txt
> describes the reverse dependency ("interrupt-names is only meaningful with an
> associated interrupts").
The interrupts are already required by the binding, so the dependency,
which makes interrupts depending on presence of interrupt-names,
effectively was making the names required.
Best regards,
Krzysztof
On 15/04/2023 11:51, Krzysztof Kozlowski wrote:
> Minor cleanup without functional impact:
> 1. Indent DTS examples to preferred four-spaces (more readable for DTS),
> 2. Drop unneeded quotes,
> 3. Add/drop blank lines to make the code readable.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> .../watchdog/amlogic,meson-gxbb-wdt.yaml | 10 +++---
Acked-by: Neil Armstrong <[email protected]>
<snip>
On 15/04/2023 at 11:51, Krzysztof Kozlowski wrote:
> Minor cleanup without functional impact:
> 1. Indent DTS examples to preferred four-spaces (more readable for DTS),
> 2. Drop unneeded quotes,
> 3. Add/drop blank lines to make the code readable.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
[..]
> .../bindings/watchdog/atmel,sama5d4-wdt.yaml | 14 ++++----
[..]
For Microchip:
Acked-by: Nicolas Ferre <[email protected]>
Thanks Krzysztof, best regards,
Nicolas
--
Nicolas Ferre
On Sat, Apr 15, 2023 at 11:58 AM Krzysztof Kozlowski
<[email protected]> wrote:
> Minor cleanup without functional impact:
> 1. Indent DTS examples to preferred four-spaces (more readable for DTS),
> 2. Drop unneeded quotes,
> 3. Add/drop blank lines to make the code readable.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> .../bindings/watchdog/renesas,wdt.yaml | 14 ++++----
Reviewed-by: Geert Uytterhoeven <[email protected]>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
On Sat, 15 Apr 2023 11:51:07 +0200, Krzysztof Kozlowski wrote:
> Two conversions to DT schema of GPIO watchdog binding happened and came
> through different trees. Merge them into one:
> 1. Combine maintainers,
> 2. Use more descriptive property descriptions and constraints from
> gpio-wdt.yaml,
> 3. Switch to unevaluatedProperties:false, to allow generic watchdog
> properties.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> .../bindings/watchdog/gpio-wdt.yaml | 55 -------------------
> .../bindings/watchdog/linux,wdt-gpio.yaml | 17 +++++-
> 2 files changed, 15 insertions(+), 57 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml
>
Reviewed-by: Rob Herring <[email protected]>
On Sat, 15 Apr 2023 11:51:08 +0200, Krzysztof Kozlowski wrote:
> Minor cleanup without functional impact:
> 1. Indent DTS examples to preferred four-spaces (more readable for DTS),
> 2. Drop unneeded quotes,
> 3. Add/drop blank lines to make the code readable.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> .../watchdog/amlogic,meson-gxbb-wdt.yaml | 10 +++---
> .../bindings/watchdog/arm,sbsa-gwdt.yaml | 1 -
> .../bindings/watchdog/arm,twd-wdt.yaml | 6 ++--
> .../bindings/watchdog/arm-smc-wdt.yaml | 7 ++--
> .../bindings/watchdog/atmel,sama5d4-wdt.yaml | 14 ++++----
> .../bindings/watchdog/brcm,bcm7038-wdt.yaml | 6 ++--
> .../bindings/watchdog/faraday,ftwdt010.yaml | 16 +++++-----
> .../watchdog/mediatek,mt7621-wdt.yaml | 6 ++--
> .../bindings/watchdog/qcom-wdt.yaml | 32 +++++++++----------
> .../bindings/watchdog/renesas,wdt.yaml | 14 ++++----
> .../bindings/watchdog/snps,dw-wdt.yaml | 32 +++++++++----------
> .../bindings/watchdog/st,stm32-iwdg.yaml | 10 +++---
> .../watchdog/xlnx,xps-timebase-wdt.yaml | 12 +++----
> 13 files changed, 83 insertions(+), 83 deletions(-)
>
Reviewed-by: Rob Herring <[email protected]>
On Sat, 15 Apr 2023 11:51:09 +0200, Krzysztof Kozlowski wrote:
> There is no need to specify minItems when they are equal to maxItems,
> because it is implied by maxItems.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> Documentation/devicetree/bindings/watchdog/arm,sp805.yaml | 1 -
> 1 file changed, 1 deletion(-)
>
Reviewed-by: Rob Herring <[email protected]>
On Sat, 15 Apr 2023 11:51:10 +0200, Krzysztof Kozlowski wrote:
> Allow generic watchdog properties by using unevaluatedProperties: false.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> .../devicetree/bindings/watchdog/fsl-imx7ulp-wdt.yaml | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
Reviewed-by: Rob Herring <[email protected]>
On Sun, Apr 16, 2023 at 07:26:27PM +0200, Krzysztof Kozlowski wrote:
> On 16/04/2023 18:04, Guenter Roeck wrote:
> > On 4/15/23 02:51, Krzysztof Kozlowski wrote:
> >> Two conversions to DT schema of GPIO watchdog binding happened and came
> >> through different trees. Merge them into one:
> >> 1. Combine maintainers,
> >> 2. Use more descriptive property descriptions and constraints from
> >> gpio-wdt.yaml,
> >> 3. Switch to unevaluatedProperties:false, to allow generic watchdog
> >> properties.
> >>
> >> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> >
> >
> > For the series:
> >
> > Reviewed-by: Guenter Roeck <[email protected]>
> >
> > On a side note, the e-mail addresses in patchwork are messed up for
> > patches sent by you. As result, I can not reply to your e-mails after
> > pulling a patch from patchwork. This means that some replies get lost
> > if I did not keep the original e-mail.
> >
> > That is how it looks like after I pull one of your patches from patchwork:
> >
> > To:
> > +=?unknown-8bit?q?Wim_Van_Sebroeck_=3Cwim=40linux-watchdog=2Eorg=3E=2C_Gu?==?unknown-8bit?q?enter_Roeck_=3Clinux=40roeck-us=2Enet=3E=2C_Rob_Herring_?==?unknown-8bit?q?=3Crobh+dt=40kernel=2Eorg=3E=2C_Krzysztof_Kozlowski_=3Ckrz?==?unknown-8bit?q?yszt
>
> (Trimmed cc list)
>
> Thanks for letting me know, I wonder what's the problem. I am sending
> with send-email exactly the same way every day, but somehow this series
> have such header in Patchwork:
> https://patchwork.kernel.org/project/linux-watchdog/patch/[email protected]/
>
> Which I do not see in:
> 1. lore:
> https://lore.kernel.org/all/[email protected]/
>
> 2. Previous patches on Patchwork:
> https://patchwork.kernel.org/project/linux-watchdog/patch/[email protected]/
>
> Lore (1 above) points to possible unescaped UTF character for
> [email protected], but I wonder why send-email did not handle it.
Looks to me like Content-Type header is missing. Usually, I get a prompt
from git-send-email with what encoding to use if it needs to use UTF8.
Rob
On Sat, 15 Apr 2023 11:51:11 +0200, Krzysztof Kozlowski wrote:
> Allow generic watchdog properties by using unevaluatedProperties: false.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> .../devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
Reviewed-by: Rob Herring <[email protected]>
On Sat, 15 Apr 2023 11:51:12 +0200, Krzysztof Kozlowski wrote:
> Required properties should be listed in "required:" block. Since
> interrupts are already there, the dependency of interrupt-names on the
> interrupts can be simplified.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> .../devicetree/bindings/watchdog/realtek,otto-wdt.yaml | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
Reviewed-by: Rob Herring <[email protected]>