Skip to content

Commit

Permalink
dt-bindings: media: csi: Fix clocks description
Browse files Browse the repository at this point in the history
Commit 1de243b ("media: dt-bindings: media: sun4i-csi: Add compatible
for CSI1 on A10/A20") introduced support for the CSI1 controller on A10 and
A20 that unlike CSI0 doesn't have an ISP and therefore only have two
clocks, the bus and module clocks.

The clocks and clock-names properties have thus been modified to allow
either two or tree clocks. However, the current list has the ISP clock at
the second position, which means the bindings expects a list of either
bus and isp, or bus, isp and mod. The initial intent of the patch was
obviously to have bus and mod in the former case.

Let's fix the binding so that it validates properly.

Fixes: 1de243b ("media: dt-bindings: media: sun4i-csi: Add compatible for CSI1 on A10/A20")
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Signed-off-by: Rob Herring <robh@kernel.org>
  • Loading branch information
Maxime Ripard authored and Rob Herring committed Feb 20, 2020
1 parent 303d37b commit 854bdba
Showing 1 changed file with 18 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,26 @@ properties:
maxItems: 1

clocks:
minItems: 2
maxItems: 3
items:
- description: The CSI interface clock
- description: The CSI ISP clock
- description: The CSI DRAM clock
oneOf:
- items:
- description: The CSI interface clock
- description: The CSI DRAM clock

- items:
- description: The CSI interface clock
- description: The CSI ISP clock
- description: The CSI DRAM clock

clock-names:
minItems: 2
maxItems: 3
items:
- const: bus
- const: isp
- const: ram
oneOf:
- items:
- const: bus
- const: ram

- items:
- const: bus
- const: isp
- const: ram

resets:
maxItems: 1
Expand Down

0 comments on commit 854bdba

Please sign in to comment.