| Message ID | 20231230-support-clearfog-gtr-l8-sfp-v4-3-1d7f0e2c7128@solid-run.com |
|---|---|
| State | New |
| Headers | show |
| Series | None | expand |
On 30/12/2023 16:44, Josua Mayer wrote: > Add DT compatible for SolidRun Armada-388 based Clearfog Base and Pro > boards, which are already in place in-tree. > > There are already 3 distinct dts in tree for these *two* boards, > declaring particular compatible strings: > - armada-388-clearfog.dts: > compatible = "solidrun,clearfog-a1", "marvell,armada388", > "marvell,armada385, "marvell,armada380"; > - armada-388-clearfog-base.dts: > compatible = "solidrun,clearfog-base-a1", "solidrun,clearfog-a1", > "marvell,armada388", "marvell,armada385, > "marvell,armada380"; > - armada-388-clearfog-pro.dts: > compatible = "solidrun,clearfog-base-a1", "solidrun,clearfog-a1", > "marvell,armada388", "marvell,armada385, > "marvell,armada380"; Drop code from commit msg. Commit msg should explain why and what, not copy the code. > > This has historic reasons, the first entry is a legacy name for the > "pro" version, old versions of u-boot built when only one variant > existed explicitly boot by this name. > > Note that both compatibles and model field include the string "A1". > At least up to revision 2.0 of the board, this had been printed > on the pcb. However in marketing material and conversations it is > usually omitted. "Clearfog Pro" and "Clearfog Pro A1" always mean > exactly the same product. > > Technically Base and Pro variants are similar enough that they can > successfully boot with each other's dts. Hence it makes (some) > sense for them to share the "clearfog-a1" compatible. > > Add bindings for the explicit variants including base / pro suffix. > The legacy "armada-388-clearfog.dts" is not supported by these > bindings" as it does not make sense having two bindings for one board. > > Signed-off-by: Josua Mayer <josua@solid-run.com> > --- > .../devicetree/bindings/arm/marvell/armada-38x.yaml | 15 ++++++--------- > 1 file changed, 6 insertions(+), 9 deletions(-) > > diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-38x.yaml b/Documentation/devicetree/bindings/arm/marvell/armada-38x.yaml > index 5af222e6db18..4950b840bf1c 100644 > --- a/Documentation/devicetree/bindings/arm/marvell/armada-38x.yaml > +++ b/Documentation/devicetree/bindings/arm/marvell/armada-38x.yaml > @@ -15,17 +15,14 @@ properties: > compatible: > oneOf: > > - - description: Armada 380 SoC > - items: > - - const: marvell,armada380 > - > - - description: Armada 385 SoC You just added these lines. It does not make sense to add them and immediately remove. It's a noop. > Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-38x.yaml b/Documentation/devicetree/bindings/arm/marvell/armada-38x.yaml index 5af222e6db18..4950b840bf1c 100644 --- a/Documentation/devicetree/bindings/arm/marvell/armada-38x.yaml +++ b/Documentation/devicetree/bindings/arm/marvell/armada-38x.yaml @@ -15,17 +15,14 @@ properties: compatible: oneOf: - - description: Armada 380 SoC - items: - - const: marvell,armada380 - - - description: Armada 385 SoC - items: - - const: marvell,armada385 - - const: marvell,armada380 + - description: + SolidRun Armada 388 clearfog family single-board computers. - - description: Armada 388 SoC items: + - enum: + - solidrun,clearfog-base-a1 + - solidrun,clearfog-pro-a1 + - const: solidrun,clearfog-a1 - const: marvell,armada388 - const: marvell,armada385 - const: marvell,armada380
Add DT compatible for SolidRun Armada-388 based Clearfog Base and Pro boards, which are already in place in-tree. There are already 3 distinct dts in tree for these *two* boards, declaring particular compatible strings: - armada-388-clearfog.dts: compatible = "solidrun,clearfog-a1", "marvell,armada388", "marvell,armada385, "marvell,armada380"; - armada-388-clearfog-base.dts: compatible = "solidrun,clearfog-base-a1", "solidrun,clearfog-a1", "marvell,armada388", "marvell,armada385, "marvell,armada380"; - armada-388-clearfog-pro.dts: compatible = "solidrun,clearfog-base-a1", "solidrun,clearfog-a1", "marvell,armada388", "marvell,armada385, "marvell,armada380"; This has historic reasons, the first entry is a legacy name for the "pro" version, old versions of u-boot built when only one variant existed explicitly boot by this name. Note that both compatibles and model field include the string "A1". At least up to revision 2.0 of the board, this had been printed on the pcb. However in marketing material and conversations it is usually omitted. "Clearfog Pro" and "Clearfog Pro A1" always mean exactly the same product. Technically Base and Pro variants are similar enough that they can successfully boot with each other's dts. Hence it makes (some) sense for them to share the "clearfog-a1" compatible. Add bindings for the explicit variants including base / pro suffix. The legacy "armada-388-clearfog.dts" is not supported by these bindings" as it does not make sense having two bindings for one board. Signed-off-by: Josua Mayer <josua@solid-run.com> --- .../devicetree/bindings/arm/marvell/armada-38x.yaml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)