Skip to content

Commit 6bf331d

Browse files
committed
Merge tag 'devicetree-fixes-for-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring: - Another batch of graph and video-interfaces schema conversions - Drop DT header symlink for dropped C6X arch - Fix bcm2711-hdmi schema error * tag 'devicetree-fixes-for-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: media: Use graph and video-interfaces schemas, round 2 dts: drop dangling c6x symlink dt-bindings: bcm2711-hdmi: Fix broken schema
2 parents 54663cf + b5a95bb commit 6bf331d

7 files changed

Lines changed: 25 additions & 40 deletions

File tree

Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ required:
109109
- resets
110110
- ddc
111111

112-
unevaluatedProperties: false
112+
additionalProperties: false
113113

114114
examples:
115115
- |

Documentation/devicetree/bindings/media/i2c/imx258.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,14 @@ properties:
4949

5050
# See ../video-interfaces.txt for more details
5151
port:
52-
type: object
52+
$ref: /schemas/graph.yaml#/properties/port
53+
additionalProperties: false
54+
5355
properties:
5456
endpoint:
55-
type: object
57+
$ref: /schemas/media/video-interfaces.yaml#
58+
unevaluatedProperties: false
59+
5660
properties:
5761
data-lanes:
5862
oneOf:
@@ -65,11 +69,7 @@ properties:
6569
- const: 1
6670
- const: 2
6771

68-
link-frequencies:
69-
allOf:
70-
- $ref: /schemas/types.yaml#/definitions/uint64-array
71-
description:
72-
Allowed data bus frequencies.
72+
link-frequencies: true
7373

7474
required:
7575
- data-lanes

Documentation/devicetree/bindings/media/i2c/ovti,ov5647.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ properties:
3131
maxItems: 1
3232

3333
port:
34-
$ref: /schemas/graph.yaml#/$defs/port-base
34+
$ref: /schemas/graph.yaml#/properties/port
35+
additionalProperties: false
3536

3637
properties:
3738
endpoint:
@@ -41,8 +42,6 @@ properties:
4142
properties:
4243
clock-noncontinuous: true
4344

44-
additionalProperties: false
45-
4645
required:
4746
- compatible
4847
- reg

Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,17 @@ properties:
4444
description: Reset Pin GPIO Control (active low)
4545

4646
port:
47-
type: object
4847
description: MIPI CSI-2 transmitter port
48+
$ref: /schemas/graph.yaml#/properties/port
49+
additionalProperties: false
4950

5051
properties:
5152
endpoint:
52-
type: object
53+
$ref: /schemas/media/video-interfaces.yaml#
54+
unevaluatedProperties: false
5355

5456
properties:
55-
remote-endpoint: true
56-
57-
link-frequencies:
58-
$ref: /schemas/types.yaml#/definitions/uint64-array
59-
description: Allowed MIPI CSI-2 link frequencies
57+
link-frequencies: true
6058

6159
data-lanes:
6260
minItems: 1
@@ -65,10 +63,6 @@ properties:
6563
required:
6664
- data-lanes
6765
- link-frequencies
68-
- remote-endpoint
69-
70-
required:
71-
- endpoint
7266

7367
required:
7468
- compatible

Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,17 @@ properties:
4444
description: Reset Pin GPIO Control (active low)
4545

4646
port:
47-
type: object
4847
description: MIPI CSI-2 transmitter port
48+
$ref: /schemas/graph.yaml#/properties/port
49+
additionalProperties: false
4950

5051
properties:
5152
endpoint:
52-
type: object
53+
$ref: /schemas/media/video-interfaces.yaml#
54+
unevaluatedProperties: false
5355

5456
properties:
55-
remote-endpoint: true
56-
57-
link-frequencies:
58-
$ref: /schemas/types.yaml#/definitions/uint64-array
59-
description: Allowed MIPI CSI-2 link frequencies
57+
link-frequencies: true
6058

6159
data-lanes:
6260
minItems: 1
@@ -65,10 +63,6 @@ properties:
6563
required:
6664
- data-lanes
6765
- link-frequencies
68-
- remote-endpoint
69-
70-
required:
71-
- endpoint
7266

7367
required:
7468
- compatible

Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,17 @@ properties:
3636
description: Reference to the GPIO connected to the XCLR pin, if any.
3737

3838
port:
39-
type: object
4039
additionalProperties: false
4140
$ref: /schemas/graph.yaml#/properties/port
4241

4342
properties:
4443
endpoint:
45-
type: object
44+
$ref: /schemas/media/video-interfaces.yaml#
45+
unevaluatedProperties: false
46+
4647
properties:
47-
data-lanes:
48-
$ref: ../video-interfaces.yaml#/properties/data-lanes
49-
link-frequencies:
50-
$ref: ../video-interfaces.yaml#/properties/link-frequencies
48+
data-lanes: true
49+
link-frequencies: true
5150

5251
required:
5352
- data-lanes

scripts/dtc/include-prefixes/c6x

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)