Skip to content

Commit f88321a

Browse files
committed
dt-bindings: Move fixed string 'patternProperties' to 'properties'
There's no need for fixed strings to be under 'patternProperties', so move them under 'properties' instead. Cc: Jean Delvare <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Kishon Vijay Abraham I <[email protected]> Cc: Vinod Koul <[email protected]> Cc: Saravanan Sekar <[email protected]> Cc: Mark Brown <[email protected]> Cc: Jagan Teki <[email protected]> Cc: Troy Kisky <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Signed-off-by: Rob Herring <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Guenter Roeck <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent e891726 commit f88321a

File tree

5 files changed

+60
-59
lines changed

5 files changed

+60
-59
lines changed

Documentation/devicetree/bindings/hwmon/adt7475.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,7 @@ properties:
3939
reg:
4040
maxItems: 1
4141

42-
patternProperties:
43-
"^adi,bypass-attenuator-in[0-4]$":
44-
description: |
45-
Configures bypassing the individual voltage input attenuator. If
46-
set to 1 the attenuator is bypassed if set to 0 the attenuator is
47-
not bypassed. If the property is absent then the attenuator
48-
retains it's configuration from the bios/bootloader.
49-
$ref: /schemas/types.yaml#/definitions/uint32
50-
enum: [0, 1]
51-
52-
"^adi,pwm-active-state$":
42+
adi,pwm-active-state:
5343
description: |
5444
Integer array, represents the active state of the pwm outputs If set to 0
5545
the pwm uses a logic low output for 100% duty cycle. If set to 1 the pwm
@@ -61,6 +51,16 @@ patternProperties:
6151
enum: [0, 1]
6252
default: 1
6353

54+
patternProperties:
55+
"^adi,bypass-attenuator-in[0-4]$":
56+
description: |
57+
Configures bypassing the individual voltage input attenuator. If
58+
set to 1 the attenuator is bypassed if set to 0 the attenuator is
59+
not bypassed. If the property is absent then the attenuator
60+
retains it's configuration from the bios/bootloader.
61+
$ref: /schemas/types.yaml#/definitions/uint32
62+
enum: [0, 1]
63+
6464
required:
6565
- compatible
6666
- reg

Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,34 @@ properties:
7777
Type-C spec states minimum CC pin debounce of 100 ms and maximum
7878
of 200 ms. However, some solutions might need more than 200 ms.
7979

80+
refclk-dig:
81+
type: object
82+
description: |
83+
WIZ node should have subnode for refclk_dig to select the reference
84+
clock source for the reference clock used in the PHY and PMA digital
85+
logic.
86+
properties:
87+
clocks:
88+
minItems: 2
89+
maxItems: 4
90+
description: Phandle to two (Torrent) or four (Sierra) clock nodes representing
91+
the inputs to refclk_dig
92+
93+
"#clock-cells":
94+
const: 0
95+
96+
assigned-clocks:
97+
maxItems: 1
98+
99+
assigned-clock-parents:
100+
maxItems: 1
101+
102+
required:
103+
- clocks
104+
- "#clock-cells"
105+
- assigned-clocks
106+
- assigned-clock-parents
107+
80108
patternProperties:
81109
"^pll[0|1]-refclk$":
82110
type: object
@@ -121,34 +149,6 @@ patternProperties:
121149
- clocks
122150
- "#clock-cells"
123151

124-
"^refclk-dig$":
125-
type: object
126-
description: |
127-
WIZ node should have subnode for refclk_dig to select the reference
128-
clock source for the reference clock used in the PHY and PMA digital
129-
logic.
130-
properties:
131-
clocks:
132-
minItems: 2
133-
maxItems: 4
134-
description: Phandle to two (Torrent) or four (Sierra) clock nodes representing
135-
the inputs to refclk_dig
136-
137-
"#clock-cells":
138-
const: 0
139-
140-
assigned-clocks:
141-
maxItems: 1
142-
143-
assigned-clock-parents:
144-
maxItems: 1
145-
146-
required:
147-
- clocks
148-
- "#clock-cells"
149-
- assigned-clocks
150-
- assigned-clock-parents
151-
152152
"^serdes@[0-9a-f]+$":
153153
type: object
154154
description: |

Documentation/devicetree/bindings/regulator/mps,mpq7920.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ properties:
3636
switching frequency must be one of following corresponding value
3737
1.1MHz, 1.65MHz, 2.2MHz, 2.75MHz
3838
39-
patternProperties:
40-
"^ldo[1-4]$":
39+
ldortc:
4140
type: object
4241
$ref: regulator.yaml#
4342

44-
"^ldortc$":
43+
patternProperties:
44+
"^ldo[1-4]$":
4545
type: object
4646
$ref: regulator.yaml#
4747

Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ properties:
8383

8484
unevaluatedProperties: false
8585

86-
"^vsnvs$":
86+
properties:
87+
vsnvs:
8788
type: object
8889
$ref: regulator.yaml#
8990
description:

Documentation/devicetree/bindings/spi/spi-controller.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -79,22 +79,7 @@ properties:
7979
description:
8080
The SPI controller acts as a slave, instead of a master.
8181

82-
allOf:
83-
- if:
84-
not:
85-
required:
86-
- spi-slave
87-
then:
88-
properties:
89-
"#address-cells":
90-
const: 1
91-
else:
92-
properties:
93-
"#address-cells":
94-
const: 0
95-
96-
patternProperties:
97-
"^slave$":
82+
slave:
9883
type: object
9984

10085
properties:
@@ -105,6 +90,7 @@ patternProperties:
10590
required:
10691
- compatible
10792

93+
patternProperties:
10894
"^.*@[0-9a-f]+$":
10995
type: object
11096

@@ -180,6 +166,20 @@ patternProperties:
180166
- compatible
181167
- reg
182168

169+
allOf:
170+
- if:
171+
not:
172+
required:
173+
- spi-slave
174+
then:
175+
properties:
176+
"#address-cells":
177+
const: 1
178+
else:
179+
properties:
180+
"#address-cells":
181+
const: 0
182+
183183
additionalProperties: true
184184

185185
examples:

0 commit comments

Comments
 (0)