[PATCH v4 1/3] dt-bindings: media: Add i.MX8 ISI DT bindings

[PATCH v4 1/3] dt-bindings: media: Add i.MX8 ISI DT bindings

[Laurent Pinchart]

The Image Sensing Interface (ISI) combines image processing pipelines
with DMA engines to process and capture frames originating from a
variety of sources. The inputs to the ISI go through Pixel Link
interfaces, and their number and nature is SoC-dependent. They cover
both capture interfaces (MIPI CSI-2 RX, HDMI RX) and memory inputs.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
Changes since v3:

- Drop patternProperties for ports node
- Add i.MX8MN example

Changes since v2:

- Describe the interrupts property
- Set global minItems and maxItems for interrupts
- Set maxItems for power-domains

Changes since v1:

- Fix compatible string checks in conditional schema
- Fix interrupts property handling

dt-bindings: media: imx8-isi: Add i.MX8MN example

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 .../bindings/media/nxp,imx8-isi.yaml          | 173 ++++++++++++++++++
 1 file changed, 173 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml

diff --git a/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml b/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
new file mode 100644
index 000000000000..6038b9b5ab36
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
@@ -0,0 +1,173 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/nxp,imx8-isi.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: i.MX8 Image Sensing Interface
+
+maintainers:
+  - Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+
+description: |
+  The Image Sensing Interface (ISI) combines image processing pipelines with
+  DMA engines to process and capture frames originating from a variety of
+  sources. The inputs to the ISI go through Pixel Link interfaces, and their
+  number and nature is SoC-dependent. They cover both capture interfaces (MIPI
+  CSI-2 RX, HDMI RX, ...) and display engine outputs for writeback support.
+
+properties:
+  compatible:
+    enum:
+      - fsl,imx8mn-isi
+      - fsl,imx8mp-isi
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    items:
+      - description: The AXI clock
+      - description: The APB clock
+      # TODO: Check if the per-channel ipg_proc_clk clocks need to be specified
+      # as well, in case some SoCs have the ability to control them separately.
+      # This may be the case of the i.MX8[DQ]X(P)
+
+  clock-names:
+    items:
+      - const: axi
+      - const: apb
+
+  fsl,blk-ctrl:
+    $ref: /schemas/types.yaml#/definitions/phandle
+    description:
+      A phandle referencing the block control that contains the CSIS to ISI
+      gasket.
+
+  interrupts:
+    description: Processing pipeline interrupts, one per pipeline
+    minItems: 1
+    maxItems: 2
+
+  power-domains:
+    maxItems: 1
+
+  ports:
+    $ref: /schemas/graph.yaml#/properties/ports
+    description: |
+      Ports represent the Pixel Link inputs to the ISI. Their number and
+      assignment are model-dependent. Each port shall have a single endpoint.
+
+required:
+  - compatible
+  - reg
+  - interrupts
+  - clocks
+  - clock-names
+  - fsl,blk-ctrl
+  - ports
+
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: fsl,imx8mn-isi
+    then:
+      properties:
+        interrupts:
+          maxItems: 1
+        ports:
+          properties:
+            port@0:
+              description: MIPI CSI-2 RX
+          required:
+            - port@0
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: fsl,imx8mp-isi
+    then:
+      properties:
+        interrupts:
+          maxItems: 2
+        ports:
+          properties:
+            port@0:
+              description: MIPI CSI-2 RX 0
+            port@1:
+              description: MIPI CSI-2 RX 1
+          required:
+            - port@0
+            - port@1
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/clock/imx8mn-clock.h>
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+    #include <dt-bindings/interrupt-controller/irq.h>
+    #include <dt-bindings/power/imx8mn-power.h>
+
+    isi@32e20000 {
+        compatible = "fsl,imx8mn-isi";
+        reg = <0x32e20000 0x100>;
+        interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&clk IMX8MN_CLK_DISP_AXI_ROOT>,
+                 <&clk IMX8MN_CLK_DISP_APB_ROOT>;
+        clock-names = "axi", "apb";
+        fsl,blk-ctrl = <&disp_blk_ctrl>;
+        power-domains = <&disp_blk_ctrl IMX8MN_DISPBLK_PD_ISI>;
+
+        ports {
+            #address-cells = <1>;
+            #size-cells = <0>;
+
+            port@0 {
+                reg = <0>;
+                isi_in: endpoint {
+                    remote-endpoint = <&mipi_csi_out>;
+                };
+            };
+        };
+    };
+
+  - |
+    #include <dt-bindings/clock/imx8mp-clock.h>
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+    #include <dt-bindings/interrupt-controller/irq.h>
+
+    isi@32e00000 {
+        compatible = "fsl,imx8mp-isi";
+        reg = <0x32e00000 0x4000>;
+        interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
+                     <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&clk IMX8MP_CLK_MEDIA_AXI_ROOT>,
+                 <&clk IMX8MP_CLK_MEDIA_APB_ROOT>;
+        clock-names = "axi", "apb";
+        fsl,blk-ctrl = <&media_blk_ctrl>;
+        power-domains = <&mediamix_pd>;
+
+        ports {
+            #address-cells = <1>;
+            #size-cells = <0>;
+
+            port@0 {
+                reg = <0>;
+                isi_in_0: endpoint {
+                    remote-endpoint = <&mipi_csi_0_out>;
+                };
+            };
+
+            port@1 {
+                reg = <1>;
+                isi_in_1: endpoint {
+                    remote-endpoint = <&mipi_csi_1_out>;
+                };
+            };
+        };
+    };
+...
-- 
Regards,

Laurent Pinchart

Re: [PATCH v4 1/3] dt-bindings: media: Add i.MX8 ISI DT bindings

[Rob Herring]

On Thu, 26 Jan 2023 19:06:01 +0200, Laurent Pinchart wrote:
> The Image Sensing Interface (ISI) combines image processing pipelines
> with DMA engines to process and capture frames originating from a
> variety of sources. The inputs to the ISI go through Pixel Link
> interfaces, and their number and nature is SoC-dependent. They cover
> both capture interfaces (MIPI CSI-2 RX, HDMI RX) and memory inputs.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> Changes since v3:
> 
> - Drop patternProperties for ports node
> - Add i.MX8MN example
> 
> Changes since v2:
> 
> - Describe the interrupts property
> - Set global minItems and maxItems for interrupts
> - Set maxItems for power-domains
> 
> Changes since v1:
> 
> - Fix compatible string checks in conditional schema
> - Fix interrupts property handling
> 
> dt-bindings: media: imx8-isi: Add i.MX8MN example
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  .../bindings/media/nxp,imx8-isi.yaml          | 173 ++++++++++++++++++
>  1 file changed, 173 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
> 

Reviewed-by: Rob Herring <robh@kernel.org>

[PATCH v4 2/3] dt-bindings: media: imx8-isi: Use 'port' instead of 'ports' for i.MX8MN

[Laurent Pinchart]

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 .../bindings/media/nxp,imx8-isi.yaml          | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml b/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
index 6038b9b5ab36..121594569395 100644
--- a/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
+++ b/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
@@ -52,11 +52,21 @@ properties:
   power-domains:
     maxItems: 1
 
+  port:
+    $ref: /schemas/graph.yaml#/properties/port
+    description: |
+      The port represents the Pixel Link input to the ISI. It shall have a
+      single endpoint. This property is only used for ISI instances with a
+      single port (as in the i.MX8MN). For instances that includes multiple
+      ports, the 'ports' property shall be used instead.
+
   ports:
     $ref: /schemas/graph.yaml#/properties/ports
     description: |
       Ports represent the Pixel Link inputs to the ISI. Their number and
-      assignment are model-dependent. Each port shall have a single endpoint.
+      assignment are model-dependent. For ISI instances that have a single
+      port, the 'port' property should be used instead. Each port shall have a
+      single endpoint.
 
 required:
   - compatible
@@ -65,7 +75,6 @@ required:
   - clocks
   - clock-names
   - fsl,blk-ctrl
-  - ports
 
 allOf:
   - if:
@@ -77,12 +86,11 @@ allOf:
       properties:
         interrupts:
           maxItems: 1
-        ports:
-          properties:
-            port@0:
-              description: MIPI CSI-2 RX
-          required:
-            - port@0
+        port:
+          description: MIPI CSI-2 RX
+        ports: false
+      required:
+        - port
 
   - if:
       properties:
@@ -93,6 +101,7 @@ allOf:
       properties:
         interrupts:
           maxItems: 2
+        port: false
         ports:
           properties:
             port@0:
@@ -102,6 +111,8 @@ allOf:
           required:
             - port@0
             - port@1
+      required:
+        - ports
 
 additionalProperties: false
 
@@ -122,15 +133,9 @@ examples:
         fsl,blk-ctrl = <&disp_blk_ctrl>;
         power-domains = <&disp_blk_ctrl IMX8MN_DISPBLK_PD_ISI>;
 
-        ports {
-            #address-cells = <1>;
-            #size-cells = <0>;
-
-            port@0 {
-                reg = <0>;
-                isi_in: endpoint {
-                    remote-endpoint = <&mipi_csi_out>;
-                };
+        port {
+            isi_in: endpoint {
+                remote-endpoint = <&mipi_csi_out>;
             };
         };
     };
-- 
Regards,

Laurent Pinchart

Re: [PATCH v4 2/3] dt-bindings: media: imx8-isi: Use 'port' instead of 'ports' for i.MX8MN

[Adam Ford]

On Thu, Jan 26, 2023 at 11:06 AM Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  .../bindings/media/nxp,imx8-isi.yaml          | 39 +++++++++++--------
>  1 file changed, 22 insertions(+), 17 deletions(-)
>

Is there a reason not to squash the two bindings into just one patch?


> diff --git a/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml b/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
> index 6038b9b5ab36..121594569395 100644
> --- a/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
> +++ b/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
> @@ -52,11 +52,21 @@ properties:
>    power-domains:
>      maxItems: 1
>
> +  port:
> +    $ref: /schemas/graph.yaml#/properties/port
> +    description: |
> +      The port represents the Pixel Link input to the ISI. It shall have a
> +      single endpoint. This property is only used for ISI instances with a
> +      single port (as in the i.MX8MN). For instances that includes multiple
> +      ports, the 'ports' property shall be used instead.
> +
>    ports:
>      $ref: /schemas/graph.yaml#/properties/ports
>      description: |
>        Ports represent the Pixel Link inputs to the ISI. Their number and
> -      assignment are model-dependent. Each port shall have a single endpoint.
> +      assignment are model-dependent. For ISI instances that have a single
> +      port, the 'port' property should be used instead. Each port shall have a
> +      single endpoint.
>
>  required:
>    - compatible
> @@ -65,7 +75,6 @@ required:
>    - clocks
>    - clock-names
>    - fsl,blk-ctrl
> -  - ports
>
>  allOf:
>    - if:
> @@ -77,12 +86,11 @@ allOf:
>        properties:
>          interrupts:
>            maxItems: 1
> -        ports:
> -          properties:
> -            port@0:
> -              description: MIPI CSI-2 RX
> -          required:
> -            - port@0
> +        port:
> +          description: MIPI CSI-2 RX
> +        ports: false
> +      required:
> +        - port
>
>    - if:
>        properties:
> @@ -93,6 +101,7 @@ allOf:
>        properties:
>          interrupts:
>            maxItems: 2
> +        port: false
>          ports:
>            properties:
>              port@0:
> @@ -102,6 +111,8 @@ allOf:
>            required:
>              - port@0
>              - port@1
> +      required:
> +        - ports
>
>  additionalProperties: false
>
> @@ -122,15 +133,9 @@ examples:
>          fsl,blk-ctrl = <&disp_blk_ctrl>;
>          power-domains = <&disp_blk_ctrl IMX8MN_DISPBLK_PD_ISI>;
>
> -        ports {
> -            #address-cells = <1>;
> -            #size-cells = <0>;
> -
> -            port@0 {
> -                reg = <0>;
> -                isi_in: endpoint {
> -                    remote-endpoint = <&mipi_csi_out>;
> -                };
> +        port {
> +            isi_in: endpoint {
> +                remote-endpoint = <&mipi_csi_out>;
>              };
>          };
>      };
> --
> Regards,
>
> Laurent Pinchart
>

Re: [PATCH v4 2/3] dt-bindings: media: imx8-isi: Use 'port' instead of 'ports' for i.MX8MN

[Laurent Pinchart]

Hi Adam,

On Thu, Jan 26, 2023 at 12:31:16PM -0600, Adam Ford wrote:
> On Thu, Jan 26, 2023 at 11:06 AM Laurent Pinchart wrote:
> >
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> >  .../bindings/media/nxp,imx8-isi.yaml          | 39 +++++++++++--------
> >  1 file changed, 22 insertions(+), 17 deletions(-)
> 
> Is there a reason not to squash the two bindings into just one patch?

As indicated in the cover letter, I've kept this separate to clearly
show the impact on the bindings. If using a 'port' node is the preferred
option, I can squash this patch, if using a 'ports' unconditionally is
favoured, then I'll just drop it.

> > diff --git a/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml b/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
> > index 6038b9b5ab36..121594569395 100644
> > --- a/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
> > +++ b/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
> > @@ -52,11 +52,21 @@ properties:
> >    power-domains:
> >      maxItems: 1
> >
> > +  port:
> > +    $ref: /schemas/graph.yaml#/properties/port
> > +    description: |
> > +      The port represents the Pixel Link input to the ISI. It shall have a
> > +      single endpoint. This property is only used for ISI instances with a
> > +      single port (as in the i.MX8MN). For instances that includes multiple
> > +      ports, the 'ports' property shall be used instead.
> > +
> >    ports:
> >      $ref: /schemas/graph.yaml#/properties/ports
> >      description: |
> >        Ports represent the Pixel Link inputs to the ISI. Their number and
> > -      assignment are model-dependent. Each port shall have a single endpoint.
> > +      assignment are model-dependent. For ISI instances that have a single
> > +      port, the 'port' property should be used instead. Each port shall have a
> > +      single endpoint.
> >
> >  required:
> >    - compatible
> > @@ -65,7 +75,6 @@ required:
> >    - clocks
> >    - clock-names
> >    - fsl,blk-ctrl
> > -  - ports
> >
> >  allOf:
> >    - if:
> > @@ -77,12 +86,11 @@ allOf:
> >        properties:
> >          interrupts:
> >            maxItems: 1
> > -        ports:
> > -          properties:
> > -            port@0:
> > -              description: MIPI CSI-2 RX
> > -          required:
> > -            - port@0
> > +        port:
> > +          description: MIPI CSI-2 RX
> > +        ports: false
> > +      required:
> > +        - port
> >
> >    - if:
> >        properties:
> > @@ -93,6 +101,7 @@ allOf:
> >        properties:
> >          interrupts:
> >            maxItems: 2
> > +        port: false
> >          ports:
> >            properties:
> >              port@0:
> > @@ -102,6 +111,8 @@ allOf:
> >            required:
> >              - port@0
> >              - port@1
> > +      required:
> > +        - ports
> >
> >  additionalProperties: false
> >
> > @@ -122,15 +133,9 @@ examples:
> >          fsl,blk-ctrl = <&disp_blk_ctrl>;
> >          power-domains = <&disp_blk_ctrl IMX8MN_DISPBLK_PD_ISI>;
> >
> > -        ports {
> > -            #address-cells = <1>;
> > -            #size-cells = <0>;
> > -
> > -            port@0 {
> > -                reg = <0>;
> > -                isi_in: endpoint {
> > -                    remote-endpoint = <&mipi_csi_out>;
> > -                };
> > +        port {
> > +            isi_in: endpoint {
> > +                remote-endpoint = <&mipi_csi_out>;
> >              };
> >          };
> >      };

-- 
Regards,

Laurent Pinchart

Re: [PATCH v4 2/3] dt-bindings: media: imx8-isi: Use 'port' instead of 'ports' for i.MX8MN

[Adam Ford]

On Thu, Jan 26, 2023 at 12:40 PM Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
>
> Hi Adam,
>
> On Thu, Jan 26, 2023 at 12:31:16PM -0600, Adam Ford wrote:
> > On Thu, Jan 26, 2023 at 11:06 AM Laurent Pinchart wrote:
> > >
> > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > > ---
> > >  .../bindings/media/nxp,imx8-isi.yaml          | 39 +++++++++++--------
> > >  1 file changed, 22 insertions(+), 17 deletions(-)
> >
> > Is there a reason not to squash the two bindings into just one patch?
>
> As indicated in the cover letter, I've kept this separate to clearly
> show the impact on the bindings. If using a 'port' node is the preferred
> option, I can squash this patch, if using a 'ports' unconditionally is
> favoured, then I'll just drop it.

Sorry, I missed that.

That makes sense

adam
>
> > > diff --git a/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml b/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
> > > index 6038b9b5ab36..121594569395 100644
> > > --- a/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
> > > +++ b/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
> > > @@ -52,11 +52,21 @@ properties:
> > >    power-domains:
> > >      maxItems: 1
> > >
> > > +  port:
> > > +    $ref: /schemas/graph.yaml#/properties/port
> > > +    description: |
> > > +      The port represents the Pixel Link input to the ISI. It shall have a
> > > +      single endpoint. This property is only used for ISI instances with a
> > > +      single port (as in the i.MX8MN). For instances that includes multiple
> > > +      ports, the 'ports' property shall be used instead.
> > > +
> > >    ports:
> > >      $ref: /schemas/graph.yaml#/properties/ports
> > >      description: |
> > >        Ports represent the Pixel Link inputs to the ISI. Their number and
> > > -      assignment are model-dependent. Each port shall have a single endpoint.
> > > +      assignment are model-dependent. For ISI instances that have a single
> > > +      port, the 'port' property should be used instead. Each port shall have a
> > > +      single endpoint.
> > >
> > >  required:
> > >    - compatible
> > > @@ -65,7 +75,6 @@ required:
> > >    - clocks
> > >    - clock-names
> > >    - fsl,blk-ctrl
> > > -  - ports
> > >
> > >  allOf:
> > >    - if:
> > > @@ -77,12 +86,11 @@ allOf:
> > >        properties:
> > >          interrupts:
> > >            maxItems: 1
> > > -        ports:
> > > -          properties:
> > > -            port@0:
> > > -              description: MIPI CSI-2 RX
> > > -          required:
> > > -            - port@0
> > > +        port:
> > > +          description: MIPI CSI-2 RX
> > > +        ports: false
> > > +      required:
> > > +        - port
> > >
> > >    - if:
> > >        properties:
> > > @@ -93,6 +101,7 @@ allOf:
> > >        properties:
> > >          interrupts:
> > >            maxItems: 2
> > > +        port: false
> > >          ports:
> > >            properties:
> > >              port@0:
> > > @@ -102,6 +111,8 @@ allOf:
> > >            required:
> > >              - port@0
> > >              - port@1
> > > +      required:
> > > +        - ports
> > >
> > >  additionalProperties: false
> > >
> > > @@ -122,15 +133,9 @@ examples:
> > >          fsl,blk-ctrl = <&disp_blk_ctrl>;
> > >          power-domains = <&disp_blk_ctrl IMX8MN_DISPBLK_PD_ISI>;
> > >
> > > -        ports {
> > > -            #address-cells = <1>;
> > > -            #size-cells = <0>;
> > > -
> > > -            port@0 {
> > > -                reg = <0>;
> > > -                isi_in: endpoint {
> > > -                    remote-endpoint = <&mipi_csi_out>;
> > > -                };
> > > +        port {
> > > +            isi_in: endpoint {
> > > +                remote-endpoint = <&mipi_csi_out>;
> > >              };
> > >          };
> > >      };
>
> --
> Regards,
>
> Laurent Pinchart

Re: [PATCH v4 2/3] dt-bindings: media: imx8-isi: Use 'port' instead of 'ports' for i.MX8MN

[Rob Herring]

On Thu, Jan 26, 2023 at 08:39:59PM +0200, Laurent Pinchart wrote:
> Hi Adam,
> 
> On Thu, Jan 26, 2023 at 12:31:16PM -0600, Adam Ford wrote:
> > On Thu, Jan 26, 2023 at 11:06 AM Laurent Pinchart wrote:
> > >
> > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > > ---
> > >  .../bindings/media/nxp,imx8-isi.yaml          | 39 +++++++++++--------
> > >  1 file changed, 22 insertions(+), 17 deletions(-)
> > 
> > Is there a reason not to squash the two bindings into just one patch?
> 
> As indicated in the cover letter, I've kept this separate to clearly
> show the impact on the bindings. If using a 'port' node is the preferred
> option, I can squash this patch, if using a 'ports' unconditionally is
> favoured, then I'll just drop it.

Just always use 'ports'.

Rob