| Message ID | 20230306194223.1869814-2-martin.blumenstingl@googlemail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | meson-uart: Use "divide XTAL by 2" bit on G12A | expand |
On 06/03/2023 20:42, Martin Blumenstingl wrote: > Amlogic G12A SoCs gained a new "divide XTAL by 2" bit. Everything else > (we know about) is identical to the UART IP on GX (GXBB/GXL/GXM) SoCs. > Add a new compatible string for this SoC so this new bit can be managed > accordingly while keeping "amlogic,meson-gx-uart" as fallback compatible > string. > > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > --- > Changes from v1 -> v2: > - make meson-gx-uart a valid compatible string for meson-g12a-uart > > > .../bindings/serial/amlogic,meson-uart.yaml | 28 +++++++++++++------ > 1 file changed, 19 insertions(+), 9 deletions(-) > > diff --git a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml > index 3cbdde85ed71..f3af0da8edaf 100644 > --- a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml > +++ b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml > @@ -26,21 +26,31 @@ properties: > compatible: > oneOf: > - description: Always-on power domain UART controller > - items: > + oneOf: > + - items: > + - enum: > + - amlogic,meson6-uart > + - amlogic,meson8-uart > + - amlogic,meson8b-uart > + - amlogic,meson-gx-uart > + - amlogic,meson-s4-uart > + - const: amlogic,meson-ao-uart > + - items: > + - const: amlogic,meson-g12a-uart > + - const: amlogic,meson-gx-uart > + - const: amlogic,meson-ao-uart > + - description: Everything-Else power domain UART controller > + oneOf: > - enum: > - amlogic,meson6-uart > - amlogic,meson8-uart > - amlogic,meson8b-uart > - amlogic,meson-gx-uart > + - amlogic,meson-g12a-uart > - amlogic,meson-s4-uart > - - const: amlogic,meson-ao-uart > - - description: Everything-Else power domain UART controller > - enum: > - - amlogic,meson6-uart > - - amlogic,meson8-uart > - - amlogic,meson8b-uart > - - amlogic,meson-gx-uart > - - amlogic,meson-s4-uart > + - items: > + - const: amlogic,meson-g12a-uart > + - const: amlogic,meson-gx-uart Difficult to review... You claim you add only g12a which seems like is happening there but with some other changes. I see g12a three times and a lot of reshuffling. I also see multiple oneOf, so something is clearly wrong. oneOf is only one. Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml index 3cbdde85ed71..f3af0da8edaf 100644 --- a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml +++ b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml @@ -26,21 +26,31 @@ properties: compatible: oneOf: - description: Always-on power domain UART controller - items: + oneOf: + - items: + - enum: + - amlogic,meson6-uart + - amlogic,meson8-uart + - amlogic,meson8b-uart + - amlogic,meson-gx-uart + - amlogic,meson-s4-uart + - const: amlogic,meson-ao-uart + - items: + - const: amlogic,meson-g12a-uart + - const: amlogic,meson-gx-uart + - const: amlogic,meson-ao-uart + - description: Everything-Else power domain UART controller + oneOf: - enum: - amlogic,meson6-uart - amlogic,meson8-uart - amlogic,meson8b-uart - amlogic,meson-gx-uart + - amlogic,meson-g12a-uart - amlogic,meson-s4-uart - - const: amlogic,meson-ao-uart - - description: Everything-Else power domain UART controller - enum: - - amlogic,meson6-uart - - amlogic,meson8-uart - - amlogic,meson8b-uart - - amlogic,meson-gx-uart - - amlogic,meson-s4-uart + - items: + - const: amlogic,meson-g12a-uart + - const: amlogic,meson-gx-uart reg: maxItems: 1
Amlogic G12A SoCs gained a new "divide XTAL by 2" bit. Everything else (we know about) is identical to the UART IP on GX (GXBB/GXL/GXM) SoCs. Add a new compatible string for this SoC so this new bit can be managed accordingly while keeping "amlogic,meson-gx-uart" as fallback compatible string. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- Changes from v1 -> v2: - make meson-gx-uart a valid compatible string for meson-g12a-uart .../bindings/serial/amlogic,meson-uart.yaml | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-)