From 9615e017464dfbe72e12e36592b7c5b65e9203fd Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Sun, 6 Jul 2025 11:58:05 +0200 Subject: [PATCH] dt-bindings: arm: sunxi: Combine board variants into enums The common style in all bindings for enumerating similar variants is to use 'enum', not 'oneOf', so all boards of same variant or using same SoM should be grouped under enum. It is more readable, more compact and makes easier to find actual devices from the same family/type. Also there is completely no point to repeat the compatible in the description (incircuit,icnova-a20-adb4006 implies this is "ICnova A20 ADB4006" and pine64,pinephone-1.2 implies "Pine64 PinePhone (1.2)"). Combine two easily visible cases: ICnova A20 and Pine64 PinePhone. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Chen-Yu Tsai Link: https://patch.msgid.link/20250706095804.50475-2-krzysztof.kozlowski@linaro.org Signed-off-by: Chen-Yu Tsai --- .../devicetree/bindings/arm/sunxi.yaml | 31 ++++++------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/sunxi.yaml b/Documentation/devicetree/bindings/arm/sunxi.yaml index c41d0a0b89e6..c25a22fe4d25 100644 --- a/Documentation/devicetree/bindings/arm/sunxi.yaml +++ b/Documentation/devicetree/bindings/arm/sunxi.yaml @@ -341,15 +341,11 @@ properties: - const: allwinner,i12-tvbox - const: allwinner,sun7i-a20 - - description: ICnova A20 ADB4006 + - description: ICnova A20 items: - - const: incircuit,icnova-a20-adb4006 - - const: incircuit,icnova-a20 - - const: allwinner,sun7i-a20 - - - description: ICNova A20 SWAC - items: - - const: incircuit,icnova-a20-swac + - enum: + - incircuit,icnova-a20-adb4006 + - incircuit,icnova-a20-swac - const: incircuit,icnova-a20 - const: allwinner,sun7i-a20 @@ -760,21 +756,12 @@ properties: - const: pine64,pinebook - const: allwinner,sun50i-a64 - - description: Pine64 PinePhone Developer Batch (1.0) - items: - - const: pine64,pinephone-1.0 - - const: pine64,pinephone - - const: allwinner,sun50i-a64 - - - description: Pine64 PinePhone Braveheart (1.1) - items: - - const: pine64,pinephone-1.1 - - const: pine64,pinephone - - const: allwinner,sun50i-a64 - - - description: Pine64 PinePhone (1.2) + - description: Pine64 PinePhone items: - - const: pine64,pinephone-1.2 + - enum: + - pine64,pinephone-1.0 # Developer Batch (1.0) + - pine64,pinephone-1.1 # Braveheart (1.1) + - pine64,pinephone-1.2 - const: pine64,pinephone - const: allwinner,sun50i-a64 -- 2.47.2