[PATCH 1/2] dt-bindings: media: csi: Add interconnects properties

[PATCH 1/2] dt-bindings: media: csi: Add interconnects properties

[Maxime Ripard]

The Allwinner CSI controller is sitting beside the MBUS that is represented
as an interconnect.

Make sure that the interconnect properties are valid in the binding.

Fixes: 7866d6903ce8 ("media: dt-bindings: media: sun4i-csi: Add compatible for CSI0 on R40")
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
 .../bindings/media/allwinner,sun4i-a10-csi.yaml        | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml b/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
index 9af873b43acd..afde17d9dab1 100644
--- a/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
+++ b/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
@@ -51,6 +51,16 @@ properties:
   resets:
     maxItems: 1
 
+  # FIXME: This should be made required eventually once every SoC will
+  # have the MBUS declared.
+  interconnects:
+    maxItems: 1
+
+  # FIXME: This should be made required eventually once every SoC will
+  # have the MBUS declared.
+  interconnect-names:
+    const: dma-mem
+
   # See ./video-interfaces.txt for details
   port:
     type: object
-- 
2.24.1

[PATCH 2/2] dt-bindings: media: csi: Fix clocks description

[Maxime Ripard]

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>
---
 .../media/allwinner,sun4i-a10-csi.yaml        | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml b/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
index afde17d9dab1..8453ee340b9f 100644
--- a/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
+++ b/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
@@ -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
-- 
2.24.1

Re: [PATCH 1/2] dt-bindings: media: csi: Add interconnects properties

[Rob Herring]

On Mon, 10 Feb 2020 11:04:16 +0100, Maxime Ripard wrote:
> The Allwinner CSI controller is sitting beside the MBUS that is represented
> as an interconnect.
> 
> Make sure that the interconnect properties are valid in the binding.
> 
> Fixes: 7866d6903ce8 ("media: dt-bindings: media: sun4i-csi: Add compatible for CSI0 on R40")
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
> ---
>  .../bindings/media/allwinner,sun4i-a10-csi.yaml        | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 

Applied, thanks.

Rob

Re: [PATCH 2/2] dt-bindings: media: csi: Fix clocks description

[Rob Herring]

On Mon, 10 Feb 2020 11:04:17 +0100, Maxime Ripard wrote:
> 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>
> ---
>  .../media/allwinner,sun4i-a10-csi.yaml        | 30 +++++++++++--------
>  1 file changed, 18 insertions(+), 12 deletions(-)
> 

Applied, thanks.

Rob