| Message ID | 20240620113150.83466-19-ryan@testtoast.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: sun4i: add Display Engine 3.3 (DE33) support | expand |
On Thu, 20 Jun 2024 23:29:56 +1200, Ryan Walklin wrote: > The Allwinner H616 and variants have a new display engine revision > (DE33). > > Add display engine bus, clock and mixer bindings for the DE33. > > Signed-off-by: Ryan Walklin <ryan@testtoast.com> > --- > .../devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml | 7 ++++--- > .../bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml | 1 + > .../bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml | 1 + > 3 files changed, 6 insertions(+), 3 deletions(-) > My bot found errors running 'make dt_binding_check' on your patch: yamllint warnings/errors: ./Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml:27:9: [warning] wrong indentation: expected 10 but found 8 (indentation) dtschema/dtc warnings/errors: /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.example.dtb: bus@1000000: compatible: ['allwinner,sun50i-a64-de2'] is valid under each of {'items': [{'const': 'allwinner,sun50i-a64-de2'}], 'type': 'array', 'minItems': 1, 'maxItems': 1}, {'items': [{'const': 'allwinner,sun50i-a64-de2'}], 'type': 'array', 'minItems': 1, 'maxItems': 1} from schema $id: http://devicetree.org/schemas/bus/allwinner,sun50i-a64-de2.yaml# doc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20240620113150.83466-19-ryan@testtoast.com 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.
On Thu, 20 Jun 2024 23:29:56 +1200 Ryan Walklin <ryan@testtoast.com> wrote: > The Allwinner H616 and variants have a new display engine revision > (DE33). > > Add display engine bus, clock and mixer bindings for the DE33. > > Signed-off-by: Ryan Walklin <ryan@testtoast.com> > --- > .../devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml | 7 ++++--- > .../bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml | 1 + > .../bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml | 1 + > 3 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml b/Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml > index 9845a187bdf65..631027375e33b 100644 > --- a/Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml > +++ b/Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml > @@ -23,9 +23,10 @@ properties: > compatible: > oneOf: > - const: allwinner,sun50i-a64-de2 > - - items: > - - const: allwinner,sun50i-h6-de3 > - - const: allwinner,sun50i-a64-de2 > + - enum: > + - allwinner,sun50i-h6-de3 > + - allwinner,sun50i-h616-de33 > + - const: allwinner,sun50i-a64-de2 That doesn't look right, that would allow: - h6-de - h616-de33 - a64-de2 which is not what we want, right? It's more: - h6-de, a64-de2 - h616-de, a64-de2 - a64-de2 I think allwinner,sun8i-a23-rsb.yaml uses the pattern you are after. Cheers, Andre > > reg: > maxItems: 1 > 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
Hi, On Tue, 25 Jun 2024, at 12:37 PM, Andre Przywara wrote: > That doesn't look right, that would allow: > - h6-de > - h616-de33 > - a64-de2 > > which is not what we want, right? It's more: > - h6-de, a64-de2 > - h616-de, a64-de2 > - a64-de2 Ah right, have got my head round how the fallback works now, thanks! Ryan
diff --git a/Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml b/Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml index 9845a187bdf65..631027375e33b 100644 --- a/Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml +++ b/Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml @@ -23,9 +23,10 @@ properties: compatible: oneOf: - const: allwinner,sun50i-a64-de2 - - items: - - const: allwinner,sun50i-h6-de3 - - const: allwinner,sun50i-a64-de2 + - enum: + - allwinner,sun50i-h6-de3 + - allwinner,sun50i-h616-de33 + - const: allwinner,sun50i-a64-de2 reg: maxItems: 1 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). Add display engine bus, clock and mixer bindings for the DE33. Signed-off-by: Ryan Walklin <ryan@testtoast.com> --- .../devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml | 7 ++++--- .../bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml | 1 + .../bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml | 1 + 3 files changed, 6 insertions(+), 3 deletions(-)