| Message ID | 20220412042807.47519-3-samuel@sholland.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/sun4i: Allwinner D1 Display Engine 2.0 Support | expand |
On Mon, Apr 11, 2022 at 11:27:54PM -0500, Samuel Holland wrote: > Allwinner D1 contains a display engine 2.0. It features two mixers, a > TCON TOP (with DSI and HDMI), one TCON LCD, and one TCON TV. > > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Signed-off-by: Samuel Holland <samuel@sholland.org> > --- > > (no changes since v1) > > .../allwinner,sun4i-a10-display-engine.yaml | 1 + > .../display/allwinner,sun4i-a10-tcon.yaml | 2 ++ > .../allwinner,sun8i-a83t-de2-mixer.yaml | 2 ++ > .../display/allwinner,sun8i-r40-tcon-top.yaml | 34 +++++++++++++++++++ > 4 files changed, 39 insertions(+) > > diff --git a/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-engine.yaml b/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-engine.yaml > index d4412aea7b73..c388ae5da1e4 100644 > --- a/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-engine.yaml > +++ b/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-engine.yaml > @@ -62,6 +62,7 @@ properties: > - allwinner,sun8i-r40-display-engine > - allwinner,sun8i-v3s-display-engine > - allwinner,sun9i-a80-display-engine > + - allwinner,sun20i-d1-display-engine > - allwinner,sun50i-a64-display-engine > - allwinner,sun50i-h6-display-engine > > diff --git a/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml b/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml > index 3a7d5d731712..4a92a4c7dcd7 100644 > --- a/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml > +++ b/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml > @@ -33,6 +33,8 @@ properties: > - const: allwinner,sun8i-v3s-tcon > - const: allwinner,sun9i-a80-tcon-lcd > - const: allwinner,sun9i-a80-tcon-tv > + - const: allwinner,sun20i-d1-tcon-lcd > + - const: allwinner,sun20i-d1-tcon-tv > > - items: > - enum: > diff --git a/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml b/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml > index 4f91eec26de9..cb243bc58ef7 100644 > --- a/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml > +++ b/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml > @@ -19,6 +19,8 @@ properties: > - allwinner,sun8i-r40-de2-mixer-0 > - allwinner,sun8i-r40-de2-mixer-1 > - allwinner,sun8i-v3s-de2-mixer > + - allwinner,sun20i-d1-de2-mixer-0 > + - allwinner,sun20i-d1-de2-mixer-1 > - allwinner,sun50i-a64-de2-mixer-0 > - allwinner,sun50i-a64-de2-mixer-1 > - allwinner,sun50i-h6-de3-mixer-0 > diff --git a/Documentation/devicetree/bindings/display/allwinner,sun8i-r40-tcon-top.yaml b/Documentation/devicetree/bindings/display/allwinner,sun8i-r40-tcon-top.yaml > index 784b267635fb..cc32e2faed91 100644 > --- a/Documentation/devicetree/bindings/display/allwinner,sun8i-r40-tcon-top.yaml > +++ b/Documentation/devicetree/bindings/display/allwinner,sun8i-r40-tcon-top.yaml > @@ -41,6 +41,7 @@ properties: > compatible: > enum: > - allwinner,sun8i-r40-tcon-top > + - allwinner,sun20i-d1-tcon-top > - allwinner,sun50i-h6-tcon-top > > reg: > @@ -154,6 +155,39 @@ allOf: > - port@2 > - port@3 > > + - if: > + properties: > + compatible: > + contains: > + const: allwinner,sun20i-d1-tcon-top > + > + then: > + properties: > + clocks: > + minItems: 4 > + maxItems: 4 You shouldn't need minItems and maxItems here and the next 2 cases. > + items: > + - description: The TCON TOP interface clock > + - description: The TCON TOP TV0 clock > + - description: The TCON TOP TVE0 clock > + - description: The TCON TOP MIPI DSI clock > + > + clock-names: > + minItems: 4 > + maxItems: 4 > + items: > + - const: bus > + - const: tcon-tv0 > + - const: tve0 > + - const: dsi > + > + clock-output-names: > + minItems: 2 > + maxItems: 2 > + items: > + - description: TCON TV0 output clock name > + - description: DSI output clock name > + > - if: > properties: > compatible: > -- > 2.35.1 > >
diff --git a/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-engine.yaml b/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-engine.yaml index d4412aea7b73..c388ae5da1e4 100644 --- a/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-engine.yaml +++ b/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-engine.yaml @@ -62,6 +62,7 @@ properties: - allwinner,sun8i-r40-display-engine - allwinner,sun8i-v3s-display-engine - allwinner,sun9i-a80-display-engine + - allwinner,sun20i-d1-display-engine - allwinner,sun50i-a64-display-engine - allwinner,sun50i-h6-display-engine diff --git a/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml b/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml index 3a7d5d731712..4a92a4c7dcd7 100644 --- a/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml +++ b/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml @@ -33,6 +33,8 @@ properties: - const: allwinner,sun8i-v3s-tcon - const: allwinner,sun9i-a80-tcon-lcd - const: allwinner,sun9i-a80-tcon-tv + - const: allwinner,sun20i-d1-tcon-lcd + - const: allwinner,sun20i-d1-tcon-tv - items: - enum: diff --git a/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml b/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml index 4f91eec26de9..cb243bc58ef7 100644 --- a/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml +++ b/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml @@ -19,6 +19,8 @@ properties: - allwinner,sun8i-r40-de2-mixer-0 - allwinner,sun8i-r40-de2-mixer-1 - allwinner,sun8i-v3s-de2-mixer + - allwinner,sun20i-d1-de2-mixer-0 + - allwinner,sun20i-d1-de2-mixer-1 - allwinner,sun50i-a64-de2-mixer-0 - allwinner,sun50i-a64-de2-mixer-1 - allwinner,sun50i-h6-de3-mixer-0 diff --git a/Documentation/devicetree/bindings/display/allwinner,sun8i-r40-tcon-top.yaml b/Documentation/devicetree/bindings/display/allwinner,sun8i-r40-tcon-top.yaml index 784b267635fb..cc32e2faed91 100644 --- a/Documentation/devicetree/bindings/display/allwinner,sun8i-r40-tcon-top.yaml +++ b/Documentation/devicetree/bindings/display/allwinner,sun8i-r40-tcon-top.yaml @@ -41,6 +41,7 @@ properties: compatible: enum: - allwinner,sun8i-r40-tcon-top + - allwinner,sun20i-d1-tcon-top - allwinner,sun50i-h6-tcon-top reg: @@ -154,6 +155,39 @@ allOf: - port@2 - port@3 + - if: + properties: + compatible: + contains: + const: allwinner,sun20i-d1-tcon-top + + then: + properties: + clocks: + minItems: 4 + maxItems: 4 + items: + - description: The TCON TOP interface clock + - description: The TCON TOP TV0 clock + - description: The TCON TOP TVE0 clock + - description: The TCON TOP MIPI DSI clock + + clock-names: + minItems: 4 + maxItems: 4 + items: + - const: bus + - const: tcon-tv0 + - const: tve0 + - const: dsi + + clock-output-names: + minItems: 2 + maxItems: 2 + items: + - description: TCON TV0 output clock name + - description: DSI output clock name + - if: properties: compatible: