diff mbox series

[v2,01/16] dt-bindings: display: convert ilitek,ili9341.txt to dt-schema

Message ID 20220627194003.2395484-2-mail@conchuod.ie (mailing list archive)
State New, archived
Headers show
Series Canaan devicetree fixes | expand

Commit Message

Conor Dooley June 27, 2022, 7:39 p.m. UTC 
From: Conor Dooley <conor.dooley@microchip.com>

A dt-schema binding for the Ilitek ili9341 was created as
panel/ilitek,ili9341.yaml but the txt binding was ignored in the
process. Move the remaining items in the txt binding to the yaml one &
delete it.

The example in the txt binding has a spi-max-frequency which disagrees
with the yaml replacement (and its own documentation) so change that to
conform with the binding. There are no users in tree of the Adafruit
yx240qv29 to check against.

Link: https://cdn-learn.adafruit.com/assets/assets/000/046/879/original/SPEC-YX240QV29-T_Rev.A__1_.pdf
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
---
 .../bindings/display/ilitek,ili9341.txt       | 27 -----------
 .../display/panel/ilitek,ili9341.yaml         | 48 +++++++++++++------
 2 files changed, 34 insertions(+), 41 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/display/ilitek,ili9341.txt

Comments

Heiko Stuebner June 28, 2022, 3 p.m. UTC | #1 
Hi Conor,

Am Montag, 27. Juni 2022, 21:39:49 CEST schrieb Conor Dooley:
> From: Conor Dooley <conor.dooley@microchip.com>
> 
> A dt-schema binding for the Ilitek ili9341 was created as
> panel/ilitek,ili9341.yaml but the txt binding was ignored in the
> process. Move the remaining items in the txt binding to the yaml one &
> delete it.
> 
> The example in the txt binding has a spi-max-frequency which disagrees
> with the yaml replacement (and its own documentation) so change that to
> conform with the binding. There are no users in tree of the Adafruit
> yx240qv29 to check against.
> 
> Link: https://cdn-learn.adafruit.com/assets/assets/000/046/879/original/SPEC-YX240QV29-T_Rev.A__1_.pdf
> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>

in your v1 you already got a [0]
Reviewed-by: Rob Herring <robh@kernel.org>
for this patch

Looking at the diffstat, which didn't change, you should
include such tags in followup revisions, to prevent
reviewers from double efforts.

Heiko


[0] https://lore.kernel.org/r/20220627232054.GA3155668-robh@kernel.org

> ---
>  .../bindings/display/ilitek,ili9341.txt       | 27 -----------
>  .../display/panel/ilitek,ili9341.yaml         | 48 +++++++++++++------
>  2 files changed, 34 insertions(+), 41 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/display/ilitek,ili9341.txt
> 
> diff --git a/Documentation/devicetree/bindings/display/ilitek,ili9341.txt b/Documentation/devicetree/bindings/display/ilitek,ili9341.txt
> deleted file mode 100644
> index 169b32e4ee4e..000000000000
> --- a/Documentation/devicetree/bindings/display/ilitek,ili9341.txt
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -Ilitek ILI9341 display panels
> -
> -This binding is for display panels using an Ilitek ILI9341 controller in SPI
> -mode.
> -
> -Required properties:
> -- compatible:	"adafruit,yx240qv29", "ilitek,ili9341"
> -- dc-gpios:	D/C pin
> -- reset-gpios:	Reset pin
> -
> -The node for this driver must be a child node of a SPI controller, hence
> -all mandatory properties described in ../spi/spi-bus.txt must be specified.
> -
> -Optional properties:
> -- rotation:	panel rotation in degrees counter clockwise (0,90,180,270)
> -- backlight:	phandle of the backlight device attached to the panel
> -
> -Example:
> -	display@0{
> -		compatible = "adafruit,yx240qv29", "ilitek,ili9341";
> -		reg = <0>;
> -		spi-max-frequency = <32000000>;
> -		dc-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
> -		reset-gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
> -		rotation = <270>;
> -		backlight = <&backlight>;
> -	};
> diff --git a/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml b/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml
> index 6058948a9764..94ca92878434 100644
> --- a/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml
> +++ b/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml
> @@ -23,6 +23,7 @@ properties:
>        - enum:
>            # ili9341 240*320 Color on stm32f429-disco board
>            - st,sf-tc240t-9370-t
> +          - adafruit,yx240qv29
>        - const: ilitek,ili9341
>  
>    reg: true
> @@ -47,31 +48,50 @@ properties:
>    vddi-led-supply:
>      description: Voltage supply for the LED driver (1.65 .. 3.3 V)
>  
> -additionalProperties: false
> +unevaluatedProperties: false
>  
>  required:
>    - compatible
>    - reg
>    - dc-gpios
> -  - port
> +
> +if:
> +  properties:
> +    compatible:
> +      contains:
> +        enum:
> +          - st,sf-tc240t-9370-t
> +then:
> +  required:
> +    - port
>  
>  examples:
>    - |+
> +    #include <dt-bindings/gpio/gpio.h>
>      spi {
>          #address-cells = <1>;
>          #size-cells = <0>;
>          panel: display@0 {
> -                 compatible = "st,sf-tc240t-9370-t",
> -                              "ilitek,ili9341";
> -                 reg = <0>;
> -                 spi-3wire;
> -                 spi-max-frequency = <10000000>;
> -                 dc-gpios = <&gpiod 13 0>;
> -                 port {
> -                         panel_in: endpoint {
> -                           remote-endpoint = <&display_out>;
> -                      };
> -                 };
> -             };
> +            compatible = "st,sf-tc240t-9370-t",
> +                         "ilitek,ili9341";
> +            reg = <0>;
> +            spi-3wire;
> +            spi-max-frequency = <10000000>;
> +            dc-gpios = <&gpiod 13 0>;
> +            port {
> +                panel_in: endpoint {
> +                    remote-endpoint = <&display_out>;
> +                };
> +            };
> +        };
> +        display@1{
> +            compatible = "adafruit,yx240qv29", "ilitek,ili9341";
> +            reg = <1>;
> +            spi-max-frequency = <10000000>;
> +            dc-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
> +            reset-gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
> +            rotation = <270>;
> +            backlight = <&backlight>;
>          };
> +    };
>  ...
>
Heiko Stuebner June 28, 2022, 3:04 p.m. UTC | #2 
Am Dienstag, 28. Juni 2022, 17:00:56 CEST schrieb Heiko Stübner:
> Hi Conor,
> 
> Am Montag, 27. Juni 2022, 21:39:49 CEST schrieb Conor Dooley:
> > From: Conor Dooley <conor.dooley@microchip.com>
> > 
> > A dt-schema binding for the Ilitek ili9341 was created as
> > panel/ilitek,ili9341.yaml but the txt binding was ignored in the
> > process. Move the remaining items in the txt binding to the yaml one &
> > delete it.
> > 
> > The example in the txt binding has a spi-max-frequency which disagrees
> > with the yaml replacement (and its own documentation) so change that to
> > conform with the binding. There are no users in tree of the Adafruit
> > yx240qv29 to check against.
> > 
> > Link: https://cdn-learn.adafruit.com/assets/assets/000/046/879/original/SPEC-YX240QV29-T_Rev.A__1_.pdf
> > Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
> 
> in your v1 you already got a [0]
> Reviewed-by: Rob Herring <robh@kernel.org>
> for this patch
> 
> Looking at the diffstat, which didn't change, you should
> include such tags in followup revisions, to prevent
> reviewers from double efforts.

and now I see that the review actually happened _after_ v2 was send ;-)


> [0] https://lore.kernel.org/r/20220627232054.GA3155668-robh@kernel.org
> 
> > ---
> >  .../bindings/display/ilitek,ili9341.txt       | 27 -----------
> >  .../display/panel/ilitek,ili9341.yaml         | 48 +++++++++++++------
> >  2 files changed, 34 insertions(+), 41 deletions(-)
> >  delete mode 100644 Documentation/devicetree/bindings/display/ilitek,ili9341.txt
> > 
> > diff --git a/Documentation/devicetree/bindings/display/ilitek,ili9341.txt b/Documentation/devicetree/bindings/display/ilitek,ili9341.txt
> > deleted file mode 100644
> > index 169b32e4ee4e..000000000000
> > --- a/Documentation/devicetree/bindings/display/ilitek,ili9341.txt
> > +++ /dev/null
> > @@ -1,27 +0,0 @@
> > -Ilitek ILI9341 display panels
> > -
> > -This binding is for display panels using an Ilitek ILI9341 controller in SPI
> > -mode.
> > -
> > -Required properties:
> > -- compatible:	"adafruit,yx240qv29", "ilitek,ili9341"
> > -- dc-gpios:	D/C pin
> > -- reset-gpios:	Reset pin
> > -
> > -The node for this driver must be a child node of a SPI controller, hence
> > -all mandatory properties described in ../spi/spi-bus.txt must be specified.
> > -
> > -Optional properties:
> > -- rotation:	panel rotation in degrees counter clockwise (0,90,180,270)
> > -- backlight:	phandle of the backlight device attached to the panel
> > -
> > -Example:
> > -	display@0{
> > -		compatible = "adafruit,yx240qv29", "ilitek,ili9341";
> > -		reg = <0>;
> > -		spi-max-frequency = <32000000>;
> > -		dc-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
> > -		reset-gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
> > -		rotation = <270>;
> > -		backlight = <&backlight>;
> > -	};
> > diff --git a/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml b/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml
> > index 6058948a9764..94ca92878434 100644
> > --- a/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml
> > +++ b/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml
> > @@ -23,6 +23,7 @@ properties:
> >        - enum:
> >            # ili9341 240*320 Color on stm32f429-disco board
> >            - st,sf-tc240t-9370-t
> > +          - adafruit,yx240qv29
> >        - const: ilitek,ili9341
> >  
> >    reg: true
> > @@ -47,31 +48,50 @@ properties:
> >    vddi-led-supply:
> >      description: Voltage supply for the LED driver (1.65 .. 3.3 V)
> >  
> > -additionalProperties: false
> > +unevaluatedProperties: false
> >  
> >  required:
> >    - compatible
> >    - reg
> >    - dc-gpios
> > -  - port
> > +
> > +if:
> > +  properties:
> > +    compatible:
> > +      contains:
> > +        enum:
> > +          - st,sf-tc240t-9370-t
> > +then:
> > +  required:
> > +    - port
> >  
> >  examples:
> >    - |+
> > +    #include <dt-bindings/gpio/gpio.h>
> >      spi {
> >          #address-cells = <1>;
> >          #size-cells = <0>;
> >          panel: display@0 {
> > -                 compatible = "st,sf-tc240t-9370-t",
> > -                              "ilitek,ili9341";
> > -                 reg = <0>;
> > -                 spi-3wire;
> > -                 spi-max-frequency = <10000000>;
> > -                 dc-gpios = <&gpiod 13 0>;
> > -                 port {
> > -                         panel_in: endpoint {
> > -                           remote-endpoint = <&display_out>;
> > -                      };
> > -                 };
> > -             };
> > +            compatible = "st,sf-tc240t-9370-t",
> > +                         "ilitek,ili9341";
> > +            reg = <0>;
> > +            spi-3wire;
> > +            spi-max-frequency = <10000000>;
> > +            dc-gpios = <&gpiod 13 0>;
> > +            port {
> > +                panel_in: endpoint {
> > +                    remote-endpoint = <&display_out>;
> > +                };
> > +            };
> > +        };
> > +        display@1{
> > +            compatible = "adafruit,yx240qv29", "ilitek,ili9341";
> > +            reg = <1>;
> > +            spi-max-frequency = <10000000>;
> > +            dc-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
> > +            reset-gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
> > +            rotation = <270>;
> > +            backlight = <&backlight>;
> >          };
> > +    };
> >  ...
> > 
> 
>
Conor Dooley June 28, 2022, 4:49 p.m. UTC | #3 
On 28/06/2022 16:04, Heiko Stübner wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> Am Dienstag, 28. Juni 2022, 17:00:56 CEST schrieb Heiko Stübner:
>> Hi Conor,
>>
>> Am Montag, 27. Juni 2022, 21:39:49 CEST schrieb Conor Dooley:
>>> From: Conor Dooley <conor.dooley@microchip.com>
>>>
>>> A dt-schema binding for the Ilitek ili9341 was created as
>>> panel/ilitek,ili9341.yaml but the txt binding was ignored in the
>>> process. Move the remaining items in the txt binding to the yaml one &
>>> delete it.
>>>
>>> The example in the txt binding has a spi-max-frequency which disagrees
>>> with the yaml replacement (and its own documentation) so change that to
>>> conform with the binding. There are no users in tree of the Adafruit
>>> yx240qv29 to check against.
>>>
>>> Link: https://cdn-learn.adafruit.com/assets/assets/000/046/879/original/SPEC-YX240QV29-T_Rev.A__1_.pdf
>>> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
>>
>> in your v1 you already got a [0]
>> Reviewed-by: Rob Herring <robh@kernel.org>
>> for this patch
>>
>> Looking at the diffstat, which didn't change, you should
>> include such tags in followup revisions, to prevent
>> reviewers from double efforts.
> 
> and now I see that the review actually happened _after_ v2 was send ;-)

;) you had me scratching my head for a moment!

> 
> 
>> [0] https://lore.kernel.org/r/20220627232054.GA3155668-robh@kernel.org
>>
>>> ---
>>>  .../bindings/display/ilitek,ili9341.txt       | 27 -----------
>>>  .../display/panel/ilitek,ili9341.yaml         | 48 +++++++++++++------
>>>  2 files changed, 34 insertions(+), 41 deletions(-)
>>>  delete mode 100644 Documentation/devicetree/bindings/display/ilitek,ili9341.txt
>>>
>>> diff --git a/Documentation/devicetree/bindings/display/ilitek,ili9341.txt b/Documentation/devicetree/bindings/display/ilitek,ili9341.txt
>>> deleted file mode 100644
>>> index 169b32e4ee4e..000000000000
>>> --- a/Documentation/devicetree/bindings/display/ilitek,ili9341.txt
>>> +++ /dev/null
>>> @@ -1,27 +0,0 @@
>>> -Ilitek ILI9341 display panels
>>> -
>>> -This binding is for display panels using an Ilitek ILI9341 controller in SPI
>>> -mode.
>>> -
>>> -Required properties:
>>> -- compatible:      "adafruit,yx240qv29", "ilitek,ili9341"
>>> -- dc-gpios:        D/C pin
>>> -- reset-gpios:     Reset pin
>>> -
>>> -The node for this driver must be a child node of a SPI controller, hence
>>> -all mandatory properties described in ../spi/spi-bus.txt must be specified.
>>> -
>>> -Optional properties:
>>> -- rotation:        panel rotation in degrees counter clockwise (0,90,180,270)
>>> -- backlight:       phandle of the backlight device attached to the panel
>>> -
>>> -Example:
>>> -   display@0{
>>> -           compatible = "adafruit,yx240qv29", "ilitek,ili9341";
>>> -           reg = <0>;
>>> -           spi-max-frequency = <32000000>;
>>> -           dc-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
>>> -           reset-gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
>>> -           rotation = <270>;
>>> -           backlight = <&backlight>;
>>> -   };
>>> diff --git a/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml b/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml
>>> index 6058948a9764..94ca92878434 100644
>>> --- a/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml
>>> +++ b/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml
>>> @@ -23,6 +23,7 @@ properties:
>>>        - enum:
>>>            # ili9341 240*320 Color on stm32f429-disco board
>>>            - st,sf-tc240t-9370-t
>>> +          - adafruit,yx240qv29
>>>        - const: ilitek,ili9341
>>>
>>>    reg: true
>>> @@ -47,31 +48,50 @@ properties:
>>>    vddi-led-supply:
>>>      description: Voltage supply for the LED driver (1.65 .. 3.3 V)
>>>
>>> -additionalProperties: false
>>> +unevaluatedProperties: false
>>>
>>>  required:
>>>    - compatible
>>>    - reg
>>>    - dc-gpios
>>> -  - port
>>> +
>>> +if:
>>> +  properties:
>>> +    compatible:
>>> +      contains:
>>> +        enum:
>>> +          - st,sf-tc240t-9370-t
>>> +then:
>>> +  required:
>>> +    - port
>>>
>>>  examples:
>>>    - |+
>>> +    #include <dt-bindings/gpio/gpio.h>
>>>      spi {
>>>          #address-cells = <1>;
>>>          #size-cells = <0>;
>>>          panel: display@0 {
>>> -                 compatible = "st,sf-tc240t-9370-t",
>>> -                              "ilitek,ili9341";
>>> -                 reg = <0>;
>>> -                 spi-3wire;
>>> -                 spi-max-frequency = <10000000>;
>>> -                 dc-gpios = <&gpiod 13 0>;
>>> -                 port {
>>> -                         panel_in: endpoint {
>>> -                           remote-endpoint = <&display_out>;
>>> -                      };
>>> -                 };
>>> -             };
>>> +            compatible = "st,sf-tc240t-9370-t",
>>> +                         "ilitek,ili9341";
>>> +            reg = <0>;
>>> +            spi-3wire;
>>> +            spi-max-frequency = <10000000>;
>>> +            dc-gpios = <&gpiod 13 0>;
>>> +            port {
>>> +                panel_in: endpoint {
>>> +                    remote-endpoint = <&display_out>;
>>> +                };
>>> +            };
>>> +        };
>>> +        display@1{
>>> +            compatible = "adafruit,yx240qv29", "ilitek,ili9341";
>>> +            reg = <1>;
>>> +            spi-max-frequency = <10000000>;
>>> +            dc-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
>>> +            reset-gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
>>> +            rotation = <270>;
>>> +            backlight = <&backlight>;
>>>          };
>>> +    };
>>>  ...
>>>
>>
>>
> 
> 
> 
>
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/display/ilitek,ili9341.txt b/Documentation/devicetree/bindings/display/ilitek,ili9341.txt
deleted file mode 100644
index 169b32e4ee4e..000000000000
--- a/Documentation/devicetree/bindings/display/ilitek,ili9341.txt
+++ /dev/null
@@ -1,27 +0,0 @@ 
-Ilitek ILI9341 display panels
-
-This binding is for display panels using an Ilitek ILI9341 controller in SPI
-mode.
-
-Required properties:
-- compatible:	"adafruit,yx240qv29", "ilitek,ili9341"
-- dc-gpios:	D/C pin
-- reset-gpios:	Reset pin
-
-The node for this driver must be a child node of a SPI controller, hence
-all mandatory properties described in ../spi/spi-bus.txt must be specified.
-
-Optional properties:
-- rotation:	panel rotation in degrees counter clockwise (0,90,180,270)
-- backlight:	phandle of the backlight device attached to the panel
-
-Example:
-	display@0{
-		compatible = "adafruit,yx240qv29", "ilitek,ili9341";
-		reg = <0>;
-		spi-max-frequency = <32000000>;
-		dc-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
-		reset-gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
-		rotation = <270>;
-		backlight = <&backlight>;
-	};
diff --git a/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml b/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml
index 6058948a9764..94ca92878434 100644
--- a/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml
+++ b/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml
@@ -23,6 +23,7 @@  properties:
       - enum:
           # ili9341 240*320 Color on stm32f429-disco board
           - st,sf-tc240t-9370-t
+          - adafruit,yx240qv29
       - const: ilitek,ili9341
 
   reg: true
@@ -47,31 +48,50 @@  properties:
   vddi-led-supply:
     description: Voltage supply for the LED driver (1.65 .. 3.3 V)
 
-additionalProperties: false
+unevaluatedProperties: false
 
 required:
   - compatible
   - reg
   - dc-gpios
-  - port
+
+if:
+  properties:
+    compatible:
+      contains:
+        enum:
+          - st,sf-tc240t-9370-t
+then:
+  required:
+    - port
 
 examples:
   - |+
+    #include <dt-bindings/gpio/gpio.h>
     spi {
         #address-cells = <1>;
         #size-cells = <0>;
         panel: display@0 {
-                 compatible = "st,sf-tc240t-9370-t",
-                              "ilitek,ili9341";
-                 reg = <0>;
-                 spi-3wire;
-                 spi-max-frequency = <10000000>;
-                 dc-gpios = <&gpiod 13 0>;
-                 port {
-                         panel_in: endpoint {
-                           remote-endpoint = <&display_out>;
-                      };
-                 };
-             };
+            compatible = "st,sf-tc240t-9370-t",
+                         "ilitek,ili9341";
+            reg = <0>;
+            spi-3wire;
+            spi-max-frequency = <10000000>;
+            dc-gpios = <&gpiod 13 0>;
+            port {
+                panel_in: endpoint {
+                    remote-endpoint = <&display_out>;
+                };
+            };
+        };
+        display@1{
+            compatible = "adafruit,yx240qv29", "ilitek,ili9341";
+            reg = <1>;
+            spi-max-frequency = <10000000>;
+            dc-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
+            reset-gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
+            rotation = <270>;
+            backlight = <&backlight>;
         };
+    };
 ...