tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

dt-bindings: media: csi: Fix clocks description

Commit 1de243b07666 ("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: 1de243b07666 ("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>

authored by

Maxime Ripard and committed by
Rob Herring 854bdbae 303d37b4

+18 -12
+18 -12
Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
··· 33 33 maxItems: 1 34 34 35 35 clocks: 36 - minItems: 2 37 - maxItems: 3 38 - items: 39 - - description: The CSI interface clock 40 - - description: The CSI ISP clock 41 - - description: The CSI DRAM clock 36 + oneOf: 37 + - items: 38 + - description: The CSI interface clock 39 + - description: The CSI DRAM clock 40 + 41 + - items: 42 + - description: The CSI interface clock 43 + - description: The CSI ISP clock 44 + - description: The CSI DRAM clock 42 45 43 46 clock-names: 44 - minItems: 2 45 - maxItems: 3 46 - items: 47 - - const: bus 48 - - const: isp 49 - - const: ram 47 + oneOf: 48 + - items: 49 + - const: bus 50 + - const: ram 51 + 52 + - items: 53 + - const: bus 54 + - const: isp 55 + - const: ram 50 56 51 57 resets: 52 58 maxItems: 1