Skip to contentSkip to conversation

ARM: kirkwood: Remove duplicate DS212 compatible

PATCH In review Artem Novak 2 participants 5 messages Nov 10 – Nov 11

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v3 cover ARM: kirkwood: Remove duplicate DS212 compatible

This series removes the duplicate "synology,ds212pv10" compatible entry from the Synology DS212 Device Tree and its corresponding Kirkwood Device Tree binding.

The changes are split into separate patches for the DT binding and the Device Tree.

Changes in v3:
Added the appropriate Fixes tags.
Split the DT binding and Device Tree changes into separate patches. Addressed the checkpatch warnings reported during review.

Artem Novak (2):
dt-bindings: arm: marvell: Remove duplicate DS212 compatible
ARM: dts: kirkwood: Remove duplicate DS212 compatible

 .../devicetree/bindings/arm/marvell/marvell,kirkwood.yaml       | 1 -
 arch/arm/boot/dts/marvell/kirkwood-ds212.dts                    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
Signature · 1 line
2.56.0
#1 lore raw

PATCH v3 1/2 dt-bindings: arm: marvell: Remove duplicate DS212 compatible

The Kirkwood Device Tree binding lists "synology,ds212pv10" twice in the compatible sequence for the Synology DS212.

Remove the duplicate so that the documented compatible sequence contains only unique identifiers.

Fixes 1c5f2ea8ce7f ("dt-bindings: arm: marvell: Convert marvell,kirkwood boards to DT schema")
---
 .../devicetree/bindings/arm/marvell/marvell,kirkwood.yaml        | 1 -
 1 file changed, 1 deletion(-)
Documentation/devicetree/bindings/arm/marvell/marvell,kirkwood.yaml +0 -1
index 120784066833..bca7f98dffae 100644
@@ -55,7 +55,6 @@ properties:
       - items:
           - const: synology,ds212
           - const: synology,ds212pv10
-          - const: synology,ds212pv10
           - const: synology,ds212pv20
           - const: synology,ds213airv10
           - const: synology,ds213v10
Signature · 1 line
2.56.0
Reviewed-by on v3 1/2
#2 lore raw

Re: [PATCH v3 1/2] dt-bindings: arm: marvell: Remove duplicate DS212 compatible

Quoted 11 lines · Artem Novak

The Kirkwood Device Tree binding lists "synology,ds212pv10" twice in the compatible sequence for the Synology DS212.

Remove the duplicate so that the documented compatible sequence contains only unique identifiers.

Fixes 1c5f2ea8ce7f ("dt-bindings: arm: marvell: Convert marvell,kirkwood boards to DT schema")
---
 .../devicetree/bindings/arm/marvell/marvell,kirkwood.yaml        | 1 -
 1 file changed, 1 deletion(-)

Best regards,
Krzysztof

#3 lore raw

PATCH v3 2/2 ARM: dts: kirkwood: Remove duplicate DS212 compatible

In reply to Artem Novak

The Synology DS212 Device Tree lists "synology,ds212pv10" twice in its compatible property.

Remove the duplicate so that the compatible sequence contains only unique identifiers.

The compatible ordering is otherwise unchanged.

Fixes 2d0a7addbd10 ("ARM: Kirkwood: Add support for many Synology NAS devices")
---
 arch/arm/boot/dts/marvell/kirkwood-ds212.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/marvell/kirkwood-ds212.dts +1 -1
index 416bab50d170..8b5af51225c9 100644
@@ -14,7 +14,7 @@
 / {
 	model = "Synology DS212, DS212p v10, v20, DS213air v10, DS213 v10";
 	compatible = "synology,ds212", "synology,ds212pv10",
-		     "synology,ds212pv10", "synology,ds212pv20",
+		     "synology,ds212pv20",
 		     "synology,ds213airv10", "synology,ds213v10",
 		     "marvell,kirkwood";
 
Signature · 1 line
2.56.0
Reviewed-by on v3 2/2
#4 lore raw

Re: [PATCH v3 2/2] ARM: dts: kirkwood: Remove duplicate DS212 compatible

Quoted 6 lines · Artem Novak

The Synology DS212 Device Tree lists "synology,ds212pv10" twice in its compatible property.

Remove the duplicate so that the compatible sequence contains only unique identifiers.

Quoted 7 lines

The compatible ordering is otherwise unchanged.

Fixes 2d0a7addbd10 ("ARM: Kirkwood: Add support for many Synology NAS devices")
---
 arch/arm/boot/dts/marvell/kirkwood-ds212.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Best regards,
Krzysztof