Commit 6bf331d5 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 54663cf3 b5a95bb1
...@@ -109,7 +109,7 @@ required: ...@@ -109,7 +109,7 @@ required:
- resets - resets
- ddc - ddc
unevaluatedProperties: false additionalProperties: false
examples: examples:
- | - |
......
...@@ -49,10 +49,14 @@ properties: ...@@ -49,10 +49,14 @@ properties:
# See ../video-interfaces.txt for more details # See ../video-interfaces.txt for more details
port: port:
type: object $ref: /schemas/graph.yaml#/properties/port
additionalProperties: false
properties: properties:
endpoint: endpoint:
type: object $ref: /schemas/media/video-interfaces.yaml#
unevaluatedProperties: false
properties: properties:
data-lanes: data-lanes:
oneOf: oneOf:
...@@ -65,11 +69,7 @@ properties: ...@@ -65,11 +69,7 @@ properties:
- const: 1 - const: 1
- const: 2 - const: 2
link-frequencies: link-frequencies: true
allOf:
- $ref: /schemas/types.yaml#/definitions/uint64-array
description:
Allowed data bus frequencies.
required: required:
- data-lanes - data-lanes
......
...@@ -31,7 +31,8 @@ properties: ...@@ -31,7 +31,8 @@ properties:
maxItems: 1 maxItems: 1
port: port:
$ref: /schemas/graph.yaml#/$defs/port-base $ref: /schemas/graph.yaml#/properties/port
additionalProperties: false
properties: properties:
endpoint: endpoint:
...@@ -41,8 +42,6 @@ properties: ...@@ -41,8 +42,6 @@ properties:
properties: properties:
clock-noncontinuous: true clock-noncontinuous: true
additionalProperties: false
required: required:
- compatible - compatible
- reg - reg
......
...@@ -44,19 +44,17 @@ properties: ...@@ -44,19 +44,17 @@ properties:
description: Reset Pin GPIO Control (active low) description: Reset Pin GPIO Control (active low)
port: port:
type: object
description: MIPI CSI-2 transmitter port description: MIPI CSI-2 transmitter port
$ref: /schemas/graph.yaml#/properties/port
additionalProperties: false
properties: properties:
endpoint: endpoint:
type: object $ref: /schemas/media/video-interfaces.yaml#
unevaluatedProperties: false
properties: properties:
remote-endpoint: true link-frequencies: true
link-frequencies:
$ref: /schemas/types.yaml#/definitions/uint64-array
description: Allowed MIPI CSI-2 link frequencies
data-lanes: data-lanes:
minItems: 1 minItems: 1
...@@ -65,10 +63,6 @@ properties: ...@@ -65,10 +63,6 @@ properties:
required: required:
- data-lanes - data-lanes
- link-frequencies - link-frequencies
- remote-endpoint
required:
- endpoint
required: required:
- compatible - compatible
......
...@@ -44,19 +44,17 @@ properties: ...@@ -44,19 +44,17 @@ properties:
description: Reset Pin GPIO Control (active low) description: Reset Pin GPIO Control (active low)
port: port:
type: object
description: MIPI CSI-2 transmitter port description: MIPI CSI-2 transmitter port
$ref: /schemas/graph.yaml#/properties/port
additionalProperties: false
properties: properties:
endpoint: endpoint:
type: object $ref: /schemas/media/video-interfaces.yaml#
unevaluatedProperties: false
properties: properties:
remote-endpoint: true link-frequencies: true
link-frequencies:
$ref: /schemas/types.yaml#/definitions/uint64-array
description: Allowed MIPI CSI-2 link frequencies
data-lanes: data-lanes:
minItems: 1 minItems: 1
...@@ -65,10 +63,6 @@ properties: ...@@ -65,10 +63,6 @@ properties:
required: required:
- data-lanes - data-lanes
- link-frequencies - link-frequencies
- remote-endpoint
required:
- endpoint
required: required:
- compatible - compatible
......
...@@ -36,18 +36,17 @@ properties: ...@@ -36,18 +36,17 @@ properties:
description: Reference to the GPIO connected to the XCLR pin, if any. description: Reference to the GPIO connected to the XCLR pin, if any.
port: port:
type: object
additionalProperties: false additionalProperties: false
$ref: /schemas/graph.yaml#/properties/port $ref: /schemas/graph.yaml#/properties/port
properties: properties:
endpoint: endpoint:
type: object $ref: /schemas/media/video-interfaces.yaml#
unevaluatedProperties: false
properties: properties:
data-lanes: data-lanes: true
$ref: ../video-interfaces.yaml#/properties/data-lanes link-frequencies: true
link-frequencies:
$ref: ../video-interfaces.yaml#/properties/link-frequencies
required: required:
- data-lanes - data-lanes
......
../../../arch/c6x/boot/dts
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment