2022-08-12 07:44:04

by Samuel Holland

Subject: [PATCH] dt-bindings: display: sun4i: Add D1 TCONs to conditionals

When adding the D1 TCON bindings, I missed the conditional blocks that
restrict the binding for TCON LCD vs TCON TV hardware. Add the D1 TCON
variants to the appropriate blocks for DE2 TCON LCDs and TCON TVs.

Fixes: ae5a5d26c15c ("dt-bindings: display: Add D1 display engine compatibles")
Signed-off-by: Samuel Holland <[email protected]>
---

.../devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml b/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml
index 4a92a4c7dcd7..f8168986a0a9 100644
--- a/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml
+++ b/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml
@@ -224,43 +224,45 @@ allOf:
- const: ahb
- const: tcon-ch0
- const: lvds-alt

- if:
properties:
compatible:
contains:
enum:
- allwinner,sun8i-a83t-tcon-lcd
- allwinner,sun8i-v3s-tcon
- allwinner,sun9i-a80-tcon-lcd
+ - allwinner,sun20i-d1-tcon-lcd

then:
properties:
clocks:
minItems: 2

clock-names:
items:
- const: ahb
- const: tcon-ch0

- if:
properties:
compatible:
contains:
enum:
- allwinner,sun8i-a83t-tcon-tv
- allwinner,sun8i-r40-tcon-tv
- allwinner,sun9i-a80-tcon-tv
+ - allwinner,sun20i-d1-tcon-tv

then:
properties:
clocks:
minItems: 2

clock-names:
items:
- const: ahb
- const: tcon-ch1

- if:
@@ -269,40 +271,42 @@ allOf:
contains:
enum:
- allwinner,sun5i-a13-tcon
- allwinner,sun6i-a31-tcon
- allwinner,sun6i-a31s-tcon
- allwinner,sun7i-a20-tcon
- allwinner,sun8i-a23-tcon
- allwinner,sun8i-a33-tcon
- allwinner,sun8i-v3s-tcon
- allwinner,sun9i-a80-tcon-lcd
- allwinner,sun4i-a10-tcon
- allwinner,sun8i-a83t-tcon-lcd
+ - allwinner,sun20i-d1-tcon-lcd

then:
required:
- "#clock-cells"
- clock-output-names

- if:
properties:
compatible:
contains:
enum:
- allwinner,sun6i-a31-tcon
- allwinner,sun6i-a31s-tcon
- allwinner,sun8i-a23-tcon
- allwinner,sun8i-a33-tcon
- allwinner,sun8i-a83t-tcon-lcd
+ - allwinner,sun20i-d1-tcon-lcd

then:
properties:
resets:
minItems: 2

reset-names:
items:
- const: lcd
- const: lvds

- if:
--
2.35.1

2022-08-12 07:56:47

by Krzysztof Kozlowski

Subject: Re: [PATCH] dt-bindings: display: sun4i: Add D1 TCONs to conditionals

On 12/08/2022 10:37, Samuel Holland wrote:
> When adding the D1 TCON bindings, I missed the conditional blocks that
> restrict the binding for TCON LCD vs TCON TV hardware. Add the D1 TCON
> variants to the appropriate blocks for DE2 TCON LCDs and TCON TVs.
>
> Fixes: ae5a5d26c15c ("dt-bindings: display: Add D1 display engine compatibles")
> Signed-off-by: Samuel Holland <[email protected]>


Acked-by: Krzysztof Kozlowski <[email protected]>


Best regards,
Krzysztof

2022-08-15 08:06:36

by Maxime Ripard

Subject: Re: [PATCH] dt-bindings: display: sun4i: Add D1 TCONs to conditionals

On Fri, 12 Aug 2022 02:37:02 -0500, Samuel Holland wrote:
> When adding the D1 TCON bindings, I missed the conditional blocks that
> restrict the binding for TCON LCD vs TCON TV hardware. Add the D1 TCON
> variants to the appropriate blocks for DE2 TCON LCDs and TCON TVs.
>
>

Applied to drm/drm-misc (drm-misc-fixes).

Thanks!
Maxime