Skip to content

Commit 0f108cc

Browse files
krzkWim Van Sebroeck
authored andcommitted
dt-bindings: watchdog: re-order entries to match coding convention
The Devicetree bindings coding convention, as used in most of the files and expressed in Documentation/devicetree/bindings/example-schema.yaml, expects: 1. "allOf:" block just before "properties:" (or after "required:" for more complex cases), 2. additionalProperties/unevaluatedProperties at the end of the file, just before the examples section. Re-order few schemas to match the convention to avoid repeating review comments for new patches using existing code as template. No functional changes. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Acked-by: Guenter Roeck <linux@roeck-us.net> Acked-by: Rob Herring <robh@kernel.org> Link: https://lore.kernel.org/r/20231105184154.43700-1-krzysztof.kozlowski@linaro.org Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
1 parent d129718 commit 0f108cc

8 files changed

Lines changed: 29 additions & 29 deletions

File tree

Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Allwinner A10 Watchdog
88

9-
allOf:
10-
- $ref: watchdog.yaml#
11-
129
maintainers:
1310
- Chen-Yu Tsai <wens@csie.org>
1411
- Maxime Ripard <mripard@kernel.org>
1512

13+
allOf:
14+
- $ref: watchdog.yaml#
15+
1616
properties:
1717
compatible:
1818
oneOf:

Documentation/devicetree/bindings/watchdog/alphascale,asm9260-wdt.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Alphascale asm9260 Watchdog timer
88

9-
allOf:
10-
- $ref: watchdog.yaml#
11-
129
maintainers:
1310
- Oleksij Rempel <linux@rempel-privat.de>
1411

12+
allOf:
13+
- $ref: watchdog.yaml#
14+
1515
properties:
1616
compatible:
1717
const: alphascale,asm9260-wdt

Documentation/devicetree/bindings/watchdog/apple,wdt.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Apple SoC Watchdog
88

9-
allOf:
10-
- $ref: watchdog.yaml#
11-
129
maintainers:
1310
- Sven Peter <sven@svenpeter.dev>
1411

12+
allOf:
13+
- $ref: watchdog.yaml#
14+
1515
properties:
1616
compatible:
1717
items:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: ARM Secure Monitor Call based watchdog
88

9-
allOf:
10-
- $ref: watchdog.yaml#
11-
129
maintainers:
1310
- Julius Werner <jwerner@chromium.org>
1411

12+
allOf:
13+
- $ref: watchdog.yaml#
14+
1515
properties:
1616
compatible:
1717
enum:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: BCM63xx and BCM7038 watchdog timer
88

9-
allOf:
10-
- $ref: watchdog.yaml#
11-
129
maintainers:
1310
- Florian Fainelli <f.fainelli@gmail.com>
1411
- Justin Chen <justinpopo6@gmail.com>
1512
- Rafał Miłecki <rafal@milecki.pl>
1613

14+
allOf:
15+
- $ref: watchdog.yaml#
16+
1717
properties:
1818
compatible:
1919
enum:
@@ -29,11 +29,11 @@ properties:
2929
The clock running the watchdog. If no clock is found the driver will
3030
default to 27000000 Hz.
3131
32-
unevaluatedProperties: false
33-
3432
required:
3533
- reg
3634

35+
unevaluatedProperties: false
36+
3737
examples:
3838
- |
3939
watchdog@f040a7e8 {

Documentation/devicetree/bindings/watchdog/cnxt,cx92755-wdt.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ description: |
1212
timer counters. The first timer (called "Timer A") is the only one that can be
1313
used as watchdog.
1414
15-
allOf:
16-
- $ref: watchdog.yaml#
17-
1815
maintainers:
1916
- Baruch Siach <baruch@tkos.co.il>
2017

18+
allOf:
19+
- $ref: watchdog.yaml#
20+
2121
properties:
2222
compatible:
2323
const: cnxt,cx92755-wdt

Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Maxim 63xx Watchdog Timers
88

9-
allOf:
10-
- $ref: watchdog.yaml#
11-
- $ref: /schemas/memory-controllers/mc-peripheral-props.yaml#
12-
139
maintainers:
1410
- Marc Zyngier <maz@kernel.org>
1511
- Linus Walleij <linus.walleij@linaro.org>
1612

13+
allOf:
14+
- $ref: watchdog.yaml#
15+
- $ref: /schemas/memory-controllers/mc-peripheral-props.yaml#
16+
1717
properties:
1818
compatible:
1919
enum:

Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Synopsys Designware Watchdog Timer
88

9-
allOf:
10-
- $ref: watchdog.yaml#
11-
129
maintainers:
1310
- Jamie Iles <jamie@jamieiles.com>
1411

12+
allOf:
13+
- $ref: watchdog.yaml#
14+
1515
properties:
1616
compatible:
1717
oneOf:
@@ -73,13 +73,13 @@ properties:
7373
minItems: 16
7474
maxItems: 16
7575

76-
unevaluatedProperties: false
77-
7876
required:
7977
- compatible
8078
- reg
8179
- clocks
8280

81+
unevaluatedProperties: false
82+
8383
examples:
8484
- |
8585
watchdog@ffd02000 {

0 commit comments

Comments
 (0)