Skip to content

Commit bbba69e

Browse files
committed
dt-bindings: net/dsa: Add spi-peripheral-props.yaml references
SPI peripheral device bindings need to reference spi-peripheral-props.yaml in order to use various SPI controller specific properties. Otherwise, the unevaluatedProperties check will reject any controller specific properties. Signed-off-by: Rob Herring <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent fe3f70e commit bbba69e

File tree

4 files changed

+68
-50
lines changed

4 files changed

+68
-50
lines changed

Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml

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

77
title: Broadcom BCM53xx Ethernet switches
88

9-
allOf:
10-
- $ref: dsa.yaml#
11-
129
maintainers:
1310
- Florian Fainelli <[email protected]>
1411

@@ -68,53 +65,71 @@ required:
6865
- compatible
6966
- reg
7067

71-
# BCM585xx/586xx/88312 SoCs
72-
if:
73-
properties:
74-
compatible:
75-
contains:
76-
enum:
77-
- brcm,bcm58522-srab
78-
- brcm,bcm58523-srab
79-
- brcm,bcm58525-srab
80-
- brcm,bcm58622-srab
81-
- brcm,bcm58623-srab
82-
- brcm,bcm58625-srab
83-
- brcm,bcm88312-srab
84-
then:
85-
properties:
86-
reg:
87-
minItems: 3
88-
maxItems: 3
89-
reg-names:
90-
items:
91-
- const: srab
92-
- const: mux_config
93-
- const: sgmii_config
94-
interrupts:
95-
minItems: 13
96-
maxItems: 13
97-
interrupt-names:
98-
items:
99-
- const: link_state_p0
100-
- const: link_state_p1
101-
- const: link_state_p2
102-
- const: link_state_p3
103-
- const: link_state_p4
104-
- const: link_state_p5
105-
- const: link_state_p7
106-
- const: link_state_p8
107-
- const: phy
108-
- const: ts
109-
- const: imp_sleep_timer_p5
110-
- const: imp_sleep_timer_p7
111-
- const: imp_sleep_timer_p8
112-
required:
113-
- interrupts
114-
else:
115-
properties:
116-
reg:
117-
maxItems: 1
68+
allOf:
69+
- $ref: dsa.yaml#
70+
- if:
71+
properties:
72+
compatible:
73+
contains:
74+
enum:
75+
- brcm,bcm5325
76+
- brcm,bcm53115
77+
- brcm,bcm53125
78+
- brcm,bcm53128
79+
- brcm,bcm5365
80+
- brcm,bcm5395
81+
- brcm,bcm5397
82+
- brcm,bcm5398
83+
then:
84+
$ref: /schemas/spi/spi-peripheral-props.yaml
85+
86+
# BCM585xx/586xx/88312 SoCs
87+
- if:
88+
properties:
89+
compatible:
90+
contains:
91+
enum:
92+
- brcm,bcm58522-srab
93+
- brcm,bcm58523-srab
94+
- brcm,bcm58525-srab
95+
- brcm,bcm58622-srab
96+
- brcm,bcm58623-srab
97+
- brcm,bcm58625-srab
98+
- brcm,bcm88312-srab
99+
then:
100+
properties:
101+
reg:
102+
minItems: 3
103+
maxItems: 3
104+
reg-names:
105+
items:
106+
- const: srab
107+
- const: mux_config
108+
- const: sgmii_config
109+
interrupts:
110+
minItems: 13
111+
maxItems: 13
112+
interrupt-names:
113+
items:
114+
- const: link_state_p0
115+
- const: link_state_p1
116+
- const: link_state_p2
117+
- const: link_state_p3
118+
- const: link_state_p4
119+
- const: link_state_p5
120+
- const: link_state_p7
121+
- const: link_state_p8
122+
- const: phy
123+
- const: ts
124+
- const: imp_sleep_timer_p5
125+
- const: imp_sleep_timer_p7
126+
- const: imp_sleep_timer_p8
127+
required:
128+
- interrupts
129+
else:
130+
properties:
131+
reg:
132+
maxItems: 1
118133

119134
unevaluatedProperties: false
120135

Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ maintainers:
1212

1313
allOf:
1414
- $ref: dsa.yaml#
15+
- $ref: /schemas/spi/spi-peripheral-props.yaml#
1516

1617
properties:
1718
# See Documentation/devicetree/bindings/net/dsa/dsa.yaml for a list of additional

Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ description:
1414

1515
allOf:
1616
- $ref: "dsa.yaml#"
17+
- $ref: /schemas/spi/spi-peripheral-props.yaml#
1718

1819
maintainers:
1920
- Vladimir Oltean <[email protected]>

Documentation/devicetree/bindings/net/dsa/realtek.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ if:
108108
- reg
109109

110110
then:
111+
$ref: /schemas/spi/spi-peripheral-props.yaml#
111112
not:
112113
required:
113114
- mdc-gpios

0 commit comments

Comments
 (0)