Skip to content

Commit b0370e7

Browse files
committed
Merge tag 'tags/fpga-media-250313' into linux-6.6-mchp
FPGA media updates for 250313 * dt-bindings: media: microchip,csi2rx: fix: add minItems (Shravan Chippa 2025-02-28) * dt-bindings: media: microchip-video-dma: add option property (Shravan Chippa 2025-02-28) Signed-off-by: Conor Dooley <[email protected]>
2 parents e7baf0f + c0761a0 commit b0370e7

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

Documentation/devicetree/bindings/media/microchip,mipi-csi2rx.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ properties:
8484
1 2 - For 2 lanes enabled in IP.
8585
1 2 3 - For 3 lanes enabled in IP.
8686
1 2 3 4 - For 4 lanes enabled in IP.
87+
minItems: 1
8788
items:
8889
- const: 1
8990
- const: 2

Documentation/devicetree/bindings/media/microchip,video-dma.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ properties:
4444
description: Reserved memory for v4l2 buffers (optional)
4545
maxItems: 1
4646

47+
reset-gpios:
48+
maxItems: 1
49+
description: CSI2 module MIPI training reset
50+
4751
ports:
4852
$ref: /schemas/graph.yaml#/properties/ports
4953

0 commit comments

Comments
 (0)