Skip to content

Commit a2c29cc

Browse files
committed
Merge tag 'devicetree-fixes-for-5.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring: - Fix scalar property schemas with array constraints - Fix 'enum' lists with duplicate entries - Fix incomplete if/then/else schemas - Add Renesas RZ/V2L SoC support to Mali Bifrost binding - Maintainers update for Marvell irqchip * tag 'devicetree-fixes-for-5.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: display: panel-timing: Define a single type for properties dt-bindings: Fix array constraints on scalar properties dt-bindings: gpu: mali-bifrost: Document RZ/V2L SoC dt-bindings: net: snps: remove duplicate name dt-bindings: Fix 'enum' lists with duplicate entries dt-bindings: irqchip: mrvl,intc: refresh maintainers dt-bindings: Fix incomplete if/then/else schemas dt-bindings: power: renesas,apmu: Fix cpus property limits dt-bindings: extcon: maxim,max77843: fix ports type
2 parents de6e933 + 652980b commit a2c29cc

28 files changed

Lines changed: 145 additions & 165 deletions

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ maintainers:
1313
properties:
1414
compatible:
1515
enum:
16-
- nvidia,tegra20-pmc
1716
- nvidia,tegra20-pmc
1817
- nvidia,tegra30-pmc
1918
- nvidia,tegra114-pmc

Documentation/devicetree/bindings/bus/ti-sysc.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ properties:
3434
oneOf:
3535
- items:
3636
- enum:
37-
- ti,sysc-omap2
3837
- ti,sysc-omap2
3938
- ti,sysc-omap4
4039
- ti,sysc-omap4-simple

Documentation/devicetree/bindings/display/panel/panel-timing.yaml

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -71,78 +71,72 @@ properties:
7171

7272
hfront-porch:
7373
description: Horizontal front porch panel timing
74+
$ref: /schemas/types.yaml#/definitions/uint32-array
7475
oneOf:
75-
- $ref: /schemas/types.yaml#/definitions/uint32
76-
maxItems: 1
76+
- maxItems: 1
7777
items:
7878
description: typical number of pixels
79-
- $ref: /schemas/types.yaml#/definitions/uint32-array
80-
minItems: 3
79+
- minItems: 3
8180
maxItems: 3
8281
items:
8382
description: min, typ, max number of pixels
8483

8584
hback-porch:
8685
description: Horizontal back porch timing
86+
$ref: /schemas/types.yaml#/definitions/uint32-array
8787
oneOf:
88-
- $ref: /schemas/types.yaml#/definitions/uint32
89-
maxItems: 1
88+
- maxItems: 1
9089
items:
9190
description: typical number of pixels
92-
- $ref: /schemas/types.yaml#/definitions/uint32-array
93-
minItems: 3
91+
- minItems: 3
9492
maxItems: 3
9593
items:
9694
description: min, typ, max number of pixels
9795

9896
hsync-len:
9997
description: Horizontal sync length panel timing
98+
$ref: /schemas/types.yaml#/definitions/uint32-array
10099
oneOf:
101-
- $ref: /schemas/types.yaml#/definitions/uint32
102-
maxItems: 1
100+
- maxItems: 1
103101
items:
104102
description: typical number of pixels
105-
- $ref: /schemas/types.yaml#/definitions/uint32-array
106-
minItems: 3
103+
- minItems: 3
107104
maxItems: 3
108105
items:
109106
description: min, typ, max number of pixels
110107

111108
vfront-porch:
112109
description: Vertical front porch panel timing
110+
$ref: /schemas/types.yaml#/definitions/uint32-array
113111
oneOf:
114-
- $ref: /schemas/types.yaml#/definitions/uint32
115-
maxItems: 1
112+
- maxItems: 1
116113
items:
117114
description: typical number of lines
118-
- $ref: /schemas/types.yaml#/definitions/uint32-array
119-
minItems: 3
115+
- minItems: 3
120116
maxItems: 3
121117
items:
122118
description: min, typ, max number of lines
123119

124120
vback-porch:
125121
description: Vertical back porch panel timing
122+
$ref: /schemas/types.yaml#/definitions/uint32-array
126123
oneOf:
127-
- $ref: /schemas/types.yaml#/definitions/uint32
128-
maxItems: 1
124+
- maxItems: 1
129125
items:
130126
description: typical number of lines
131-
- $ref: /schemas/types.yaml#/definitions/uint32-array
132-
minItems: 3
127+
- minItems: 3
133128
maxItems: 3
134129
items:
135130
description: min, typ, max number of lines
136131

137132
vsync-len:
138133
description: Vertical sync length panel timing
134+
$ref: /schemas/types.yaml#/definitions/uint32-array
139135
oneOf:
140-
- $ref: /schemas/types.yaml#/definitions/uint32
141-
maxItems: 1
136+
- maxItems: 1
142137
items:
143138
description: typical number of lines
144-
- $ref: /schemas/types.yaml#/definitions/uint32-array
145-
minItems: 3
139+
- minItems: 3
146140
maxItems: 3
147141
items:
148142
description: min, typ, max number of lines

Documentation/devicetree/bindings/extcon/maxim,max77843.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ properties:
2525
$ref: /schemas/connector/usb-connector.yaml#
2626

2727
ports:
28-
$ref: /schemas/graph.yaml#/properties/port
28+
$ref: /schemas/graph.yaml#/properties/ports
2929
description:
3030
Any connector to the data bus of this controller should be modelled using
3131
the OF graph bindings specified

Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ properties:
2020
- mediatek,mt8183-mali
2121
- realtek,rtd1619-mali
2222
- renesas,r9a07g044-mali
23+
- renesas,r9a07g054-mali
2324
- rockchip,px30-mali
2425
- rockchip,rk3568-mali
2526
- const: arm,mali-bifrost # Mali Bifrost GPU model/revision is fully discoverable
@@ -109,7 +110,9 @@ allOf:
109110
properties:
110111
compatible:
111112
contains:
112-
const: renesas,r9a07g044-mali
113+
enum:
114+
- renesas,r9a07g044-mali
115+
- renesas,r9a07g054-mali
113116
then:
114117
properties:
115118
interrupts:

Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,8 @@ patternProperties:
5858
The value (two's complement) to be programmed in the channel specific N correction register.
5959
For remote channels only.
6060
$ref: /schemas/types.yaml#/definitions/int32
61-
items:
62-
minimum: -128
63-
maximum: 127
61+
minimum: -128
62+
maximum: 127
6463

6564
required:
6665
- reg

Documentation/devicetree/bindings/iio/adc/adi,ad7476.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ allOf:
9898
- ti,adc121s
9999
- ti,ads7866
100100
- ti,ads7868
101+
then:
101102
required:
102103
- vcc-supply
103104
# Devices with a vref

Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,7 @@ patternProperties:
108108
- [1-5]: order 1 to 5.
109109
For audio purpose it is recommended to use order 3 to 5.
110110
$ref: /schemas/types.yaml#/definitions/uint32
111-
items:
112-
minimum: 0
113-
maximum: 5
111+
maximum: 5
114112

115113
"#io-channel-cells":
116114
const: 1
@@ -174,7 +172,7 @@ patternProperties:
174172
contains:
175173
const: st,stm32-dfsdm-adc
176174

177-
- then:
175+
then:
178176
properties:
179177
st,adc-channels:
180178
minItems: 1
@@ -206,7 +204,7 @@ patternProperties:
206204
contains:
207205
const: st,stm32-dfsdm-dmic
208206

209-
- then:
207+
then:
210208
properties:
211209
st,adc-channels:
212210
maxItems: 1
@@ -254,7 +252,7 @@ allOf:
254252
contains:
255253
const: st,stm32h7-dfsdm
256254

257-
- then:
255+
then:
258256
patternProperties:
259257
"^filter@[0-9]+$":
260258
properties:
@@ -269,7 +267,7 @@ allOf:
269267
contains:
270268
const: st,stm32mp1-dfsdm
271269

272-
- then:
270+
then:
273271
patternProperties:
274272
"^filter@[0-9]+$":
275273
properties:

Documentation/devicetree/bindings/iio/dac/adi,ad5360.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ allOf:
5959
contains:
6060
enum:
6161
- adi,ad5371
62-
then:
63-
required:
64-
- vref2-supply
62+
then:
63+
required:
64+
- vref2-supply
6565

6666
examples:
6767
- |

Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -93,48 +93,48 @@ allOf:
9393
- qcom,sdm660-gnoc
9494
- qcom,sdm660-snoc
9595

96-
then:
97-
properties:
98-
clock-names:
99-
items:
100-
- const: bus
101-
- const: bus_a
102-
103-
clocks:
104-
items:
105-
- description: Bus Clock
106-
- description: Bus A Clock
107-
108-
# Child node's properties
109-
patternProperties:
110-
'^interconnect-[a-z0-9]+$':
111-
type: object
112-
description:
113-
snoc-mm is a child of snoc, sharing snoc's register address space.
114-
115-
properties:
116-
compatible:
117-
enum:
118-
- qcom,msm8939-snoc-mm
119-
120-
'#interconnect-cells':
121-
const: 1
122-
123-
clock-names:
124-
items:
125-
- const: bus
126-
- const: bus_a
127-
128-
clocks:
129-
items:
130-
- description: Bus Clock
131-
- description: Bus A Clock
132-
133-
required:
134-
- compatible
135-
- '#interconnect-cells'
136-
- clock-names
137-
- clocks
96+
then:
97+
properties:
98+
clock-names:
99+
items:
100+
- const: bus
101+
- const: bus_a
102+
103+
clocks:
104+
items:
105+
- description: Bus Clock
106+
- description: Bus A Clock
107+
108+
# Child node's properties
109+
patternProperties:
110+
'^interconnect-[a-z0-9]+$':
111+
type: object
112+
description:
113+
snoc-mm is a child of snoc, sharing snoc's register address space.
114+
115+
properties:
116+
compatible:
117+
enum:
118+
- qcom,msm8939-snoc-mm
119+
120+
'#interconnect-cells':
121+
const: 1
122+
123+
clock-names:
124+
items:
125+
- const: bus
126+
- const: bus_a
127+
128+
clocks:
129+
items:
130+
- description: Bus Clock
131+
- description: Bus A Clock
132+
133+
required:
134+
- compatible
135+
- '#interconnect-cells'
136+
- clock-names
137+
- clocks
138138

139139
- if:
140140
properties:

0 commit comments

Comments
 (0)