Skip to content

Commit 22088bb

Browse files
krzkgregkh
authored andcommitted
dt-bindings: serial: re-order entries to match coding convention
The DT schema coding convention expressed in Documentation/devicetree/bindings/example-schema.yaml expects entries in following order: - properties, patternProperties - required - if blocks, allOf with if-blocks - additionalProperties/unevaluatedProperties 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 <[email protected]> Reviewed-by: Geert Uytterhoeven <[email protected]> Acked-by: Conor Dooley <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 0059bc9 commit 22088bb

File tree

9 files changed

+32
-32
lines changed

9 files changed

+32
-32
lines changed

Documentation/devicetree/bindings/serial/nvidia,tegra20-hsuart.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,6 @@ properties:
9191
- description: range upper bound
9292
- description: adjustment (in permyriad, i.e. 0.01%)
9393

94-
allOf:
95-
- $ref: serial.yaml
96-
97-
unevaluatedProperties: false
98-
9994
required:
10095
- compatible
10196
- reg
@@ -106,6 +101,11 @@ required:
106101
- dmas
107102
- dma-names
108103

104+
allOf:
105+
- $ref: serial.yaml
106+
107+
unevaluatedProperties: false
108+
109109
examples:
110110
- |
111111
#include <dt-bindings/clock/tegra30-car.h>

Documentation/devicetree/bindings/serial/qcom,msm-uart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ required:
4040
- interrupts
4141
- reg
4242

43-
unevaluatedProperties: false
44-
4543
allOf:
4644
- $ref: /schemas/serial/serial.yaml#
4745

46+
unevaluatedProperties: false
47+
4848
examples:
4949
- |
5050
serial@a9c00000 {

Documentation/devicetree/bindings/serial/qcom,msm-uartdm.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ required:
7878
- interrupts
7979
- reg
8080

81-
unevaluatedProperties: false
82-
8381
allOf:
8482
- $ref: /schemas/serial/serial.yaml#
8583

@@ -97,6 +95,8 @@ allOf:
9795
reg:
9896
maxItems: 1
9997

98+
unevaluatedProperties: false
99+
100100
examples:
101101
- |
102102
#include <dt-bindings/interrupt-controller/arm-gic.h>

Documentation/devicetree/bindings/serial/renesas,em-uart.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ properties:
3838
- const: sclk
3939
- const: pclk
4040

41+
required:
42+
- compatible
43+
- reg
44+
- interrupts
45+
- clocks
46+
- clock-names
47+
4148
allOf:
4249
- $ref: serial.yaml#
4350

@@ -53,13 +60,6 @@ allOf:
5360
clock-names:
5461
minItems: 2
5562

56-
required:
57-
- compatible
58-
- reg
59-
- interrupts
60-
- clocks
61-
- clock-names
62-
6363
unevaluatedProperties: false
6464

6565
examples:

Documentation/devicetree/bindings/serial/renesas,hscif.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ required:
111111
- clock-names
112112
- power-domains
113113

114-
unevaluatedProperties: false
115-
116114
if:
117115
properties:
118116
compatible:
@@ -125,6 +123,8 @@ then:
125123
required:
126124
- resets
127125

126+
unevaluatedProperties: false
127+
128128
examples:
129129
- |
130130
#include <dt-bindings/clock/r8a7795-cpg-mssr.h>

Documentation/devicetree/bindings/serial/renesas,scifa.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ required:
7777
- clock-names
7878
- power-domains
7979

80-
unevaluatedProperties: false
81-
8280
if:
8381
properties:
8482
compatible:
@@ -89,6 +87,8 @@ then:
8987
required:
9088
- resets
9189

90+
unevaluatedProperties: false
91+
9292
examples:
9393
- |
9494
#include <dt-bindings/clock/r8a7790-cpg-mssr.h>

Documentation/devicetree/bindings/serial/renesas,scifb.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ required:
7777
- clock-names
7878
- power-domains
7979

80-
unevaluatedProperties: false
81-
8280
if:
8381
properties:
8482
compatible:
@@ -89,6 +87,8 @@ then:
8987
required:
9088
- resets
9189

90+
unevaluatedProperties: false
91+
9292
examples:
9393
- |
9494
#include <dt-bindings/clock/r8a7740-clock.h>

Documentation/devicetree/bindings/serial/samsung_uart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ required:
8686
- interrupts
8787
- reg
8888

89-
unevaluatedProperties: false
90-
9189
allOf:
9290
- $ref: serial.yaml#
9391

@@ -128,6 +126,8 @@ allOf:
128126
- const: uart
129127
- const: clk_uart_baud0
130128

129+
unevaluatedProperties: false
130+
131131
examples:
132132
- |
133133
#include <dt-bindings/clock/samsung,s3c64xx-clock.h>

Documentation/devicetree/bindings/serial/serial.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,6 @@ properties:
8787
description:
8888
TX FIFO threshold configuration (in bytes).
8989

90-
if:
91-
required:
92-
- uart-has-rtscts
93-
then:
94-
properties:
95-
cts-gpios: false
96-
rts-gpios: false
97-
9890
patternProperties:
9991
"^(bluetooth|bluetooth-gnss|gnss|gps|mcu)$":
10092
if:
@@ -136,6 +128,14 @@ patternProperties:
136128
required:
137129
- compatible
138130

131+
if:
132+
required:
133+
- uart-has-rtscts
134+
then:
135+
properties:
136+
cts-gpios: false
137+
rts-gpios: false
138+
139139
additionalProperties: true
140140

141141
examples:

0 commit comments

Comments
 (0)