From: Michael Opdenacker Date: Wed, 19 Nov 2025 09:22:38 +0000 (+0000) Subject: dt-bindings: arm: rockchip: merge Asus Tinker and Tinker S X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=605945281a65ca68af00f3d7592a191b20b21ad4;p=thirdparty%2Flinux.git dt-bindings: arm: rockchip: merge Asus Tinker and Tinker S Merge sections for Asus Tinker Board and Asus Tinker Board S. Asus Tinker Board S (Storage) is just a variant of Tinker Board with an added eMMC chip. Signed-off-by: Michael Opdenacker Acked-by: Krzysztof Kozlowski Link: https://patch.msgid.link/20251119-merge-tinker-bindings-v1-1-4072b55750c1@rootcommit.com Signed-off-by: Heiko Stuebner --- diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml index 04171fdae799f..660b89e2fc113 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@ -89,12 +89,9 @@ properties: - description: Asus Tinker board items: - - const: asus,rk3288-tinker - - const: rockchip,rk3288 - - - description: Asus Tinker board S - items: - - const: asus,rk3288-tinker-s + - enum: + - asus,rk3288-tinker + - asus,rk3288-tinker-s - const: rockchip,rk3288 - description: Beelink A1