| Message ID | 20240703105454.41254-19-ryan@testtoast.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: sun4i: add Display Engine 3.3 (DE33) support | expand |
On Wed, Jul 03, 2024 at 10:51:08PM +1200, Ryan Walklin wrote: > The Allwinner H616 and variants have a new display engine revision > (DE33). > > The mixer configuration registers are significantly different to the DE3 > and DE2 revisions, being split into separate top and display blocks, > therefore a fallback for the mixer compatible is not provided. > > Add display engine bus, clock and mixer bindings for the DE33. > > Signed-off-by: Ryan Walklin <ryan@testtoast.com> Probably this should be 3 patches given 3 subsystems, but the content is Acked-by: Conor Dooley <conor.dooley@microchip.com> Cheers, Conor. > > -- > Changelog v1..v2: > - Correct DE2 bus enum to reflect fallback devices accurately. > --- > .../devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml | 4 +++- > .../bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml | 1 + > .../bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml | 1 + > 3 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml b/Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml > index 9845a187bdf65..ea7ee89158c61 100644 > --- a/Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml > +++ b/Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml > @@ -24,7 +24,9 @@ properties: > oneOf: > - const: allwinner,sun50i-a64-de2 > - items: > - - const: allwinner,sun50i-h6-de3 > + - enum: > + - allwinner,sun50i-h6-de3 > + - allwinner,sun50i-h616-de33 > - const: allwinner,sun50i-a64-de2 > > reg: > diff --git a/Documentation/devicetree/bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml b/Documentation/devicetree/bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml > index 70369bd633e40..7fcd55d468d49 100644 > --- a/Documentation/devicetree/bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml > +++ b/Documentation/devicetree/bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml > @@ -25,6 +25,7 @@ properties: > - const: allwinner,sun50i-a64-de2-clk > - const: allwinner,sun50i-h5-de2-clk > - const: allwinner,sun50i-h6-de3-clk > + - const: allwinner,sun50i-h616-de33-clk > - items: > - const: allwinner,sun8i-r40-de2-clk > - const: allwinner,sun8i-h3-de2-clk > 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 b75c1ec686ad2..c37eb8ae1b8ee 100644 > --- a/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml > +++ b/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml > @@ -24,6 +24,7 @@ properties: > - allwinner,sun50i-a64-de2-mixer-0 > - allwinner,sun50i-a64-de2-mixer-1 > - allwinner,sun50i-h6-de3-mixer-0 > + - allwinner,sun50i-h616-de33-mixer-0 > > reg: > maxItems: 1 > -- > 2.45.2 >
On Thu, 4 Jul 2024, at 3:28 AM, Conor Dooley wrote: >> Add display engine bus, clock and mixer bindings for the DE33. >> >> Signed-off-by: Ryan Walklin <ryan@testtoast.com> > > Probably this should be 3 patches given 3 subsystems, but the content is > Acked-by: Conor Dooley <conor.dooley@microchip.com> > > Cheers, > Conor. > Thanks Conor, will separate for v3 but ack noted.
diff --git a/Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml b/Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml index 9845a187bdf65..ea7ee89158c61 100644 --- a/Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml +++ b/Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml @@ -24,7 +24,9 @@ properties: oneOf: - const: allwinner,sun50i-a64-de2 - items: - - const: allwinner,sun50i-h6-de3 + - enum: + - allwinner,sun50i-h6-de3 + - allwinner,sun50i-h616-de33 - const: allwinner,sun50i-a64-de2 reg: diff --git a/Documentation/devicetree/bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml b/Documentation/devicetree/bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml index 70369bd633e40..7fcd55d468d49 100644 --- a/Documentation/devicetree/bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml +++ b/Documentation/devicetree/bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml @@ -25,6 +25,7 @@ properties: - const: allwinner,sun50i-a64-de2-clk - const: allwinner,sun50i-h5-de2-clk - const: allwinner,sun50i-h6-de3-clk + - const: allwinner,sun50i-h616-de33-clk - items: - const: allwinner,sun8i-r40-de2-clk - const: allwinner,sun8i-h3-de2-clk 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 b75c1ec686ad2..c37eb8ae1b8ee 100644 --- a/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml +++ b/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml @@ -24,6 +24,7 @@ properties: - allwinner,sun50i-a64-de2-mixer-0 - allwinner,sun50i-a64-de2-mixer-1 - allwinner,sun50i-h6-de3-mixer-0 + - allwinner,sun50i-h616-de33-mixer-0 reg: maxItems: 1
The Allwinner H616 and variants have a new display engine revision (DE33). The mixer configuration registers are significantly different to the DE3 and DE2 revisions, being split into separate top and display blocks, therefore a fallback for the mixer compatible is not provided. Add display engine bus, clock and mixer bindings for the DE33. Signed-off-by: Ryan Walklin <ryan@testtoast.com> -- Changelog v1..v2: - Correct DE2 bus enum to reflect fallback devices accurately. --- .../devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml | 4 +++- .../bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml | 1 + .../bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-)