History

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.

Maxime Ripard committed 6 years ago

Commit 854bdba1 parent 303d37b1 file · +18 −12Browse files

Unified · Split

Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml+18−12
@@ -33,20 +33,26 @@ properties: · 32 unmodified lines
3333 maxItems: 1
3434
3535 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
4245
4346 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
5056
5157 resets:
5258 maxItems: 1

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t