Skip to contentSkip to conversation

dt-bindings: lcdif: Document a imx6sx-lcdif fallback

PATCH Superseded Fabio Estevam 4 participants 7 messages Oct 29, 2024

Subsystems (5)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH v3 1/3 dt-bindings: lcdif: Document a imx6sx-lcdif fallback

From: Fabio Estevam <[email protected]>

imx6sx.dtsi has the following lcdif entries:

compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";

This causes the following dt-schema warning:

['fsl,imx6sx-lcdif', 'fsl,imx28-lcdif'] is too long

To keep DT compatibility, document 'fsl,imx28-lcdif' as a possible 'fsl,imx6sx-lcdif' fallback.

---
Changes since v2:
- Only document fsl,imx6sx-lcdif with a fallback.

 Documentation/devicetree/bindings/display/fsl,lcdif.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/display/fsl,lcdif.yaml +4 -1
index 8e3a98aeec32..ad0cca562463 100644
@@ -19,7 +19,6 @@ properties:
       - enum:
           - fsl,imx23-lcdif
           - fsl,imx28-lcdif
-          - fsl,imx6sx-lcdif
           - fsl,imx8mp-lcdif
           - fsl,imx93-lcdif
       - items:
@@ -32,6 +31,10 @@ properties:
               - fsl,imx8mn-lcdif
               - fsl,imx8mq-lcdif
           - const: fsl,imx6sx-lcdif
+      - items:
+          - enum:
+              - fsl,imx6sx-lcdif
+          - const: fsl,imx28-lcdif
 
   reg:
     maxItems: 1
Signature · 1 line
2.34.1
author reviewer
#1 lore raw

PATCH v3 2/3 dt-bindings: lcdif: Expand the imx6sl/imx6sll fallbacks

From: Fabio Estevam <[email protected]>

mx6sl.dtsi and imx6sll.dtsi have the following lcdif entries:

compatible = "fsl,imx6sl-lcdif", "fsl,imx28-lcdif";

This causes dt-schema warnings as the current binding only allow 'fsl,imx6sx-lcdif' as fallback.

['fsl,imx6sl-lcdif', 'fsl,imx28-lcdif'] is too long ['fsl,imx6sll-lcdif', 'fsl,imx28-lcdif'] is too long

The imx6sx-lcdif programming model has more advanced features, such as overlay plane and the CRC32 support than the imx28-lcdif IP.

Expand the imx6sl/imx6sll lcdif fallbacks to accept a less specific fsl,imx28-lcdif fallback:

compatible = "fsl,imx6sl-lcdif", "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";

This helps keeping DT compatibility as well as using the more advanced lcdif features found on imx6sl and imx6sll.

---
Changes since v2:
- Make the three compatible entres the only valid combination for imx6sl and imx6sll (Andreas).

 Documentation/devicetree/bindings/display/fsl,lcdif.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/display/fsl,lcdif.yaml +6 -2
index ad0cca562463..72e509bc975b 100644
@@ -23,14 +23,18 @@ properties:
           - fsl,imx93-lcdif
       - items:
           - enum:
-              - fsl,imx6sl-lcdif
-              - fsl,imx6sll-lcdif
               - fsl,imx6ul-lcdif
               - fsl,imx7d-lcdif
               - fsl,imx8mm-lcdif
               - fsl,imx8mn-lcdif
               - fsl,imx8mq-lcdif
           - const: fsl,imx6sx-lcdif
+      - items:
+          - enum:
+              - fsl,imx6sl-lcdif
+              - fsl,imx6sll-lcdif
+          - const: fsl,imx6sx-lcdif
+          - const: fsl,imx28-lcdif
       - items:
           - enum:
               - fsl,imx6sx-lcdif
Signature · 1 line
2.34.1
maintainer
#2 lore raw

Re: [PATCH v3 2/3] dt-bindings: lcdif: Expand the imx6sl/imx6sll fallbacks

Quoted 44 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

mx6sl.dtsi and imx6sll.dtsi have the following lcdif entries:

compatible = "fsl,imx6sl-lcdif", "fsl,imx28-lcdif";

This causes dt-schema warnings as the current binding only allow 'fsl,imx6sx-lcdif' as fallback.

['fsl,imx6sl-lcdif', 'fsl,imx28-lcdif'] is too long ['fsl,imx6sll-lcdif', 'fsl,imx28-lcdif'] is too long

The imx6sx-lcdif programming model has more advanced features, such as overlay plane and the CRC32 support than the imx28-lcdif IP.

Expand the imx6sl/imx6sll lcdif fallbacks to accept a less specific fsl,imx28-lcdif fallback:

compatible = "fsl,imx6sl-lcdif", "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";

This helps keeping DT compatibility as well as using the more advanced lcdif features found on imx6sl and imx6sll.

---
Changes since v2:
- Make the three compatible entres the only valid combination for imx6sl and imx6sll (Andreas).

  Documentation/devicetree/bindings/display/fsl,lcdif.yaml | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/display/fsl,lcdif.yaml +0 -2
index ad0cca562463..72e509bc975b 100644
@@ -23,14 +23,18 @@ properties:
            - fsl,imx93-lcdif
        - items:
            - enum:
-              - fsl,imx6sl-lcdif
-              - fsl,imx6sll-lcdif
                - fsl,imx6ul-lcdif
                - fsl,imx7d-lcdif

Documentation/devicetree/bindings/display/fsl,lcdif.yaml properties: · line 37

Quoted 10 lines
Documentation/devicetree/bindings/display/fsl,lcdif.yaml +6 -0
                - fsl,imx8mm-lcdif
                - fsl,imx8mn-lcdif
                - fsl,imx8mq-lcdif
            - const: fsl,imx6sx-lcdif
+      - items:
+          - enum:
+              - fsl,imx6sl-lcdif
+              - fsl,imx6sll-lcdif
+          - const: fsl,imx6sx-lcdif
+          - const: fsl,imx28-lcdif

Shouldn't this be

- enum:
- fsl,imx6sl-lcdif
- fsl,imx6sll-lcdif
- fsl,imx6sx-lcdif
- const: fsl,imx28-lcdif

So you wouldn't have to write three compatible strings for the 6sl/sll , but only two ? I.e. this:

compatible = "fsl,imx6sl-lcdif", "fsl,imx28-lcdif"; compatible = "fsl,imx6sll-lcdif", "fsl,imx28-lcdif"; compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";

?

#3 lore raw

Re: [PATCH v3 2/3] dt-bindings: lcdif: Expand the imx6sl/imx6sll fallbacks

Quoted 63 lines · Marek Vasut
Quoted 46 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

mx6sl.dtsi and imx6sll.dtsi have the following lcdif entries:

compatible = "fsl,imx6sl-lcdif", "fsl,imx28-lcdif";

This causes dt-schema warnings as the current binding only allow 'fsl,imx6sx-lcdif' as fallback.

['fsl,imx6sl-lcdif', 'fsl,imx28-lcdif'] is too long ['fsl,imx6sll-lcdif', 'fsl,imx28-lcdif'] is too long

The imx6sx-lcdif programming model has more advanced features, such as overlay plane and the CRC32 support than the imx28-lcdif IP.

Expand the imx6sl/imx6sll lcdif fallbacks to accept a less specific fsl,imx28-lcdif fallback:

compatible = "fsl,imx6sl-lcdif", "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";

This helps keeping DT compatibility as well as using the more advanced lcdif features found on imx6sl and imx6sll.

---
Changes since v2:
- Make the three compatible entres the only valid combination for imx6sl and imx6sll (Andreas).

  Documentation/devicetree/bindings/display/fsl,lcdif.yaml | 8 ++++++--

  1 file changed, 6 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/display/fsl,lcdif.yaml +0 -0
index ad0cca562463..72e509bc975b 100644
@@ -23,14 +23,18 @@ properties:

            - fsl,imx93-lcdif
        - items:
            - enum:
-              - fsl,imx6sl-lcdif
-              - fsl,imx6sll-lcdif
                - fsl,imx6ul-lcdif
                - fsl,imx7d-lcdif
                - fsl,imx8mm-lcdif
                - fsl,imx8mn-lcdif

Quoted 8 lines

                - fsl,imx8mq-lcdif
            - const: fsl,imx6sx-lcdif
+      - items:
+          - enum:
+              - fsl,imx6sl-lcdif
+              - fsl,imx6sll-lcdif
+          - const: fsl,imx6sx-lcdif
+          - const: fsl,imx28-lcdif

Shouldn't this be

- enum:
  - fsl,imx6sl-lcdif
  - fsl,imx6sll-lcdif
  - fsl,imx6sx-lcdif
- const: fsl,imx28-lcdif

Quoted 5 lines

So you wouldn't have to write three compatible strings for the 6sl/sll , but only two ? I.e. this:

compatible = "fsl,imx6sl-lcdif", "fsl,imx28-lcdif"; compatible = "fsl,imx6sll-lcdif", "fsl,imx28-lcdif"; compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";

This would necessitate changing the Linux driver to match against the fsl,imx6sl-lcdif & fsl,imx6sll-lcdif compatible as well, otherwise new features like e.g. the overlay plane won't be available.

Cheers,
Ahmad

Quoted 3 lines

?

Signature · 4 lines
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
author reviewer
#4 lore raw

Re: [PATCH v3 2/3] dt-bindings: lcdif: Expand the imx6sl/imx6sll fallbacks

In reply to Marek Vasut

Hi Marek,

Quoted 5 lines · Marek Vasut

So you wouldn't have to write three compatible strings for the 6sl/sll , but only two ? I.e. this:

compatible = "fsl,imx6sl-lcdif", "fsl,imx28-lcdif"; compatible = "fsl,imx6sll-lcdif", "fsl,imx28-lcdif";

i.MX6SL and i.MX6SLL have a more advanced LCDIF version than the one on i.MX28.

The LCDIF block on i.MX6SL/i.MX6SLL has both overlay and CRC support, corresponding to the MXSFB_V6 of the mxsfb_drv driver.

That's why it is better to have the compatibles as:

compatible = "fsl,imx6sl-lcdif", "fsl,imx6sx-lcdif", "fsl,imx28-lcdif"; compatible = "fsl,imx6sll-lcdif", "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";

This way they can match with a more specific fsl,imx6sx-lcdif entry.

If an OS does not implement the fsl,imx6sx-lcdif match, it can still match with fsl,imx28-lcdif as a fallback, keeping the DT compatibility.

I missed updating the binding example. I will wait for more feedback before sending a v4.

Thanks

author reviewer
#5 lore raw

PATCH v3 3/3 ARM: dts: imx6sl: Provide a more specific lcdif compatible

In reply to Fabio Estevam

From: Fabio Estevam <[email protected]>

The LCDIF IP on i.MX6SL and i.MX6SLL is compatible with i.MX6SX.

Provide a more specific "fsl,imx6sx-lcdif" compatible and still keep "fsl,imx28-lcdif" for DT compatibility.

---
Changes since v2:
- None.

 arch/arm/boot/dts/nxp/imx/imx6sl.dtsi  | 3 ++-
 arch/arm/boot/dts/nxp/imx/imx6sll.dtsi | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
arch/arm/boot/dts/nxp/imx/imx6sl.dtsi +2 -1
index 6aa61235e39e..840e19b2ca0f 100644
@@ -773,7 +773,8 @@ epdc: epdc@20f4000 {
 			};
 
 			lcdif: lcdif@20f8000 {
-				compatible = "fsl,imx6sl-lcdif", "fsl,imx28-lcdif";
+				compatible = "fsl,imx6sl-lcdif", "fsl,imx6sx-lcdif",
+					     "fsl,imx28-lcdif";
 				reg = <0x020f8000 0x4000>;
 				interrupts = <0 39 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clks IMX6SL_CLK_LCDIF_PIX>,
arch/arm/boot/dts/nxp/imx/imx6sll.dtsi +2 -1
index 85fe2a4ab97a..eff83f5e5535 100644
@@ -648,7 +648,8 @@ pxp: pxp@20f0000 {
 			};
 
 			lcdif: lcd-controller@20f8000 {
-				compatible = "fsl,imx6sll-lcdif", "fsl,imx28-lcdif";
+				compatible = "fsl,imx6sll-lcdif", "fsl,imx6sx-lcdif",
+					     "fsl,imx28-lcdif";
 				reg = <0x020f8000 0x4000>;
 				interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clks IMX6SLL_CLK_LCDIF_PIX>,
Signature · 1 line
2.34.1
#6 lore raw
In reply to Fabio Estevam
Quoted 13 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

imx6sx.dtsi has the following lcdif entries:

compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";

This causes the following dt-schema warning:

['fsl,imx6sx-lcdif', 'fsl,imx28-lcdif'] is too long

To keep DT compatibility, document 'fsl,imx28-lcdif' as a possible 'fsl,imx6sx-lcdif' fallback.

Quoted 8 lines

---
Changes since v2:
- Only document fsl,imx6sx-lcdif with a fallback.

 Documentation/devicetree/bindings/display/fsl,lcdif.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

My bot found errors running 'make dt_binding_check' on your patch:

yamllint warnings/errors:

dtschema/dtc warnings/errors:
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/display/fsl,lcdif.example.dtb: display-controller@2220000: compatible: 'oneOf' conditional failed, one must be fixed:

	['fsl,imx6sx-lcdif'] is too short
	'fsl,imx6sx-lcdif' is not one of ['fsl,imx23-lcdif', 'fsl,imx28-lcdif', 'fsl,imx8mp-lcdif', 'fsl,imx93-lcdif']
	'fsl,imx6sx-lcdif' is not one of ['fsl,imx6sl-lcdif', 'fsl,imx6sll-lcdif', 'fsl,imx6ul-lcdif', 'fsl,imx7d-lcdif', 'fsl,imx8mm-lcdif', 'fsl,imx8mn-lcdif', 'fsl,imx8mq-lcdif']
	from schema $id: http://devicetree.org/schemas/display/fsl,lcdif.yaml#

doc reference errors (make refcheckdocs):

See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/[email protected]

The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch.

If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:

pip3 install dtschema --upgrade

Please check and re-submit after running the above command yourself. Note that DT_SCHEMA_FILES can be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema.