Skip to content

Commit 5af4055

Browse files
committed
Merge tag 'devicetree-fixes-for-5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring: - Add another allowed address for TI sn65dsi86 - Drop more redundant minItems/maxItems - Fix more graph 'unevaluatedProperties' warnings in media bindings * tag 'devicetree-fixes-for-5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: drm/bridge: ti-sn65dsi86: Fix reg value dt-bindings: Drop more redundant 'maxItems/minItems' dt-bindings: media: Fix more graph 'unevaluatedProperties' related warnings
2 parents 60a9483 + b2d70c0 commit 5af4055

File tree

9 files changed

+6
-12
lines changed

9 files changed

+6
-12
lines changed

Documentation/devicetree/bindings/display/bridge/ti,sn65dsi83.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ properties:
5050
data-lanes:
5151
description: array of physical DSI data lane indexes.
5252
minItems: 1
53-
maxItems: 4
5453
items:
5554
- const: 1
5655
- const: 2
@@ -71,7 +70,6 @@ properties:
7170
data-lanes:
7271
description: array of physical DSI data lane indexes.
7372
minItems: 1
74-
maxItems: 4
7573
items:
7674
- const: 1
7775
- const: 2

Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ properties:
1818
const: ti,sn65dsi86
1919

2020
reg:
21-
const: 0x2d
21+
enum: [ 0x2c, 0x2d ]
2222

2323
enable-gpios:
2424
maxItems: 1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ properties:
3131
maxItems: 1
3232

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

3737
properties:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ properties:
3838

3939
port:
4040
additionalProperties: false
41-
$ref: /schemas/graph.yaml#/properties/port
41+
$ref: /schemas/graph.yaml#/$defs/port-base
4242

4343
properties:
4444
endpoint:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ properties:
3838

3939
port:
4040
additionalProperties: false
41-
$ref: /schemas/graph.yaml#/properties/port
41+
$ref: /schemas/graph.yaml#/$defs/port-base
4242

4343
properties:
4444
endpoint:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ properties:
3838

3939
port:
4040
additionalProperties: false
41-
$ref: /schemas/graph.yaml#/properties/port
41+
$ref: /schemas/graph.yaml#/$defs/port-base
4242

4343
properties:
4444
endpoint:

Documentation/devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ properties:
2020
- snps,dwcmshc-sdhci
2121

2222
reg:
23-
minItems: 1
24-
items:
25-
- description: Offset and length of the register set for the device
23+
maxItems: 1
2624

2725
interrupts:
2826
maxItems: 1

Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ properties:
3434

3535
clocks:
3636
minItems: 3
37-
maxItems: 5
3837
items:
3938
- description: MAC host clock
4039
- description: MAC apb clock

Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ properties:
4141
- description: builtin MSI controller.
4242

4343
interrupt-names:
44-
minItems: 1
4544
items:
4645
- const: msi
4746

0 commit comments

Comments
 (0)