Message ID | 40ff1fc7f5220db7d527c57ac4bad16c3945ae08.1683725179.git.geert+renesas@glider.be |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp3628848vqo; Wed, 10 May 2023 06:35:47 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7RYxRt0XL6Y/JGL0Kn3jP2gS5pormQzIx+VpCch2sj4Z0CvtUIv8vfSHC+vS+Kjz5cqn6c X-Received: by 2002:a17:903:2281:b0:1a3:cd4c:8d08 with SMTP id b1-20020a170903228100b001a3cd4c8d08mr21971454plh.38.1683725747405; Wed, 10 May 2023 06:35:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683725747; cv=none; d=google.com; s=arc-20160816; b=II41GhZN/FI7toXsx25Bab054YSSUPczOG9gDTg4n1SeG4KJOUsnwwOldhikCtyBqo ViZTaAjk5i94RtXSn0BdsaMC5iqGyzM3ARUKYAi+A4FoBKIrohDN80sD8JIP/DITTuWz ZGr4XMY8mY5lzHZtQ/T8DfiMOyLMqxM/3ihIosCwQIX5Gf4xuXFoMVm13Ct+8bYYNwI2 +cqXDlPM/p+zKQFlKn0G9dP/YxrOTVq5zXhy0JOL+dZZC/HcoqxxKY4KG8mQP+EM14Vg iz8ZE19yEsAm9GCYMFRx5R/64iAJcXRtIjvgnxrbbv1wwMUB4F8E0Riw4Grq3tgIUk1G dB8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=Nw4sVv1A7Jo1uT+ae71gZlG1uQpzm3R/zDiAzrl/H10=; b=VVfRE8o4TscI3FdUgniadKDKf4GJbwbtkhhbrcv3Eaxzb3zbus+ouUYADeC7uX4PYx 8Yf/6P5q6FnEei/6zzFmS27SXZ+/NBcNsvxK8kej7Jw+w2DZjSMbPx3Ay/rXcrxx50NV /SLIRABjACe+pUpn3ZLKILmCOBGeWM5AEQIsOECxvjCP+6/J+QRFkpPwkWE9Ig3UO5N1 awb0SWSpbjjNBDVrImjOJx4iz3uo8eu9ciAdENmywm53FohKQbPwzpDUb/R7Cb8E3Ilb Lh6ytTaGRKy7x5YzMq0D1+wCh7aWZB72pwkxMMeVwEbSPvyyyNOL9QR2zVBLCxErLamI jG5Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k16-20020a170902ba9000b0019931c82e24si3982689pls.195.2023.05.10.06.35.33; Wed, 10 May 2023 06:35:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237034AbjEJN1v (ORCPT <rfc822;jeantsuru.cumc.mandola@gmail.com> + 99 others); Wed, 10 May 2023 09:27:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232226AbjEJN1u (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 10 May 2023 09:27:50 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E33561B2 for <linux-kernel@vger.kernel.org>; Wed, 10 May 2023 06:27:30 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed30:cc75:d8ef:4074:8af9]) by andre.telenet-ops.be with bizsmtp id v1TS2900R3l7qvk011TSVa; Wed, 10 May 2023 15:27:28 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from <geert@linux-m68k.org>) id 1pwjqg-001nF6-HV; Wed, 10 May 2023 15:27:26 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from <geert@linux-m68k.org>) id 1pwjqo-00F6wY-8K; Wed, 10 May 2023 15:27:26 +0200 From: Geert Uytterhoeven <geert+renesas@glider.be> To: Daniel Lezcano <daniel.lezcano@linaro.org>, Thomas Gleixner <tglx@linutronix.de>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Conor Dooley <conor+dt@kernel.org>, Palmer Dabbelt <palmer@dabbelt.com>, Paul Walmsley <paul.walmsley@sifive.com>, Anup Patel <anup@brainfault.org> Cc: devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven <geert+renesas@glider.be> Subject: [PATCH] dt-bindings: timer: sifive,clint: Clean up compatible value section Date: Wed, 10 May 2023 15:27:24 +0200 Message-Id: <40ff1fc7f5220db7d527c57ac4bad16c3945ae08.1683725179.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765514409343464827?= X-GMAIL-MSGID: =?utf-8?q?1765514409343464827?= |
Series |
dt-bindings: timer: sifive,clint: Clean up compatible value section
|
|
Commit Message
Geert Uytterhoeven
May 10, 2023, 1:27 p.m. UTC
Replace the sentences in the description listing some supported variants
by comments on the individual compatible values, to ease future
maintenance. While at it, restore alphabetical sort order.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
.../bindings/timer/sifive,clint.yaml | 21 +++++++------------
1 file changed, 8 insertions(+), 13 deletions(-)
Comments
On 10/05/2023 15:27, Geert Uytterhoeven wrote: > Replace the sentences in the description listing some supported variants > by comments on the individual compatible values, to ease future > maintenance. While at it, restore alphabetical sort order. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > .../bindings/timer/sifive,clint.yaml | 21 +++++++------------ > 1 file changed, 8 insertions(+), 13 deletions(-) > Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
On Wed, May 10, 2023 at 03:27:24PM +0200, Geert Uytterhoeven wrote: > Replace the sentences in the description listing some supported variants > by comments on the individual compatible values, to ease future > maintenance. While at it, restore alphabetical sort order. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > .../bindings/timer/sifive,clint.yaml | 21 +++++++------------ > 1 file changed, 8 insertions(+), 13 deletions(-) > > diff --git a/Documentation/devicetree/bindings/timer/sifive,clint.yaml b/Documentation/devicetree/bindings/timer/sifive,clint.yaml > index 94bef9424df1bc6a..34a81510678134eb 100644 > --- a/Documentation/devicetree/bindings/timer/sifive,clint.yaml > +++ b/Documentation/devicetree/bindings/timer/sifive,clint.yaml > @@ -29,11 +29,11 @@ properties: > oneOf: > - items: > - enum: > - - sifive,fu540-c000-clint > - - starfive,jh7100-clint > - - starfive,jh7110-clint > - - canaan,k210-clint > - - const: sifive,clint0 > + - canaan,k210-clint # Canaan Kendryte K210 > + - sifive,fu540-c000-clint # SiFive FU540 > + - starfive,jh7100-clint # StarFive JH7100 > + - starfive,jh7110-clint # StarFive JH7110 > + - const: sifive,clint0 # SiFive CLINT v0 IP block > - items: > - enum: > - allwinner,sun20i-d1-clint > @@ -45,14 +45,9 @@ properties: > description: For the QEMU virt machine only > > description: > - Should be "<vendor>,<chip>-clint" and "sifive,clint<version>". > - Supported compatible strings are - > - "sifive,fu540-c000-clint" for the SiFive CLINT v0 as integrated > - onto the SiFive FU540 chip, "canaan,k210-clint" for the SiFive > - CLINT v0 as integrated onto the Canaan Kendryte K210 chip, and > - "sifive,clint0" for the SiFive CLINT v0 IP block with no chip > - integration tweaks. > - Please refer to sifive-blocks-ip-versioning.txt for details > + Should be "<vendor>,<chip>-clint", followed by "sifive,clint<version>" > + when compatible with a SiFive CLINT. Please refer to > + sifive-blocks-ip-versioning.txt for details regarding the latter. Does this section actually add any value at all? By nature of oneOf structure above, such an ordering is required for existing entries. For something not here, should we instead be noting that sifive,clint0 is to be used when compatible with the SiFive/RISC-V clint, rather than doing a sifive-blocks-ip-versioning.txt dance? As it stands though, patch is an improvement, so: Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Thanks, Conor.
Hi Conor, On Wed, May 10, 2023 at 6:02 PM Conor Dooley <conor@kernel.org> wrote: > On Wed, May 10, 2023 at 03:27:24PM +0200, Geert Uytterhoeven wrote: > > Replace the sentences in the description listing some supported variants > > by comments on the individual compatible values, to ease future > > maintenance. While at it, restore alphabetical sort order. > > > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > > --- > > .../bindings/timer/sifive,clint.yaml | 21 +++++++------------ > > 1 file changed, 8 insertions(+), 13 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/timer/sifive,clint.yaml b/Documentation/devicetree/bindings/timer/sifive,clint.yaml > > index 94bef9424df1bc6a..34a81510678134eb 100644 > > --- a/Documentation/devicetree/bindings/timer/sifive,clint.yaml > > +++ b/Documentation/devicetree/bindings/timer/sifive,clint.yaml > > @@ -29,11 +29,11 @@ properties: > > oneOf: > > - items: > > - enum: > > - - sifive,fu540-c000-clint > > - - starfive,jh7100-clint > > - - starfive,jh7110-clint > > - - canaan,k210-clint > > - - const: sifive,clint0 > > + - canaan,k210-clint # Canaan Kendryte K210 > > + - sifive,fu540-c000-clint # SiFive FU540 > > + - starfive,jh7100-clint # StarFive JH7100 > > + - starfive,jh7110-clint # StarFive JH7110 > > + - const: sifive,clint0 # SiFive CLINT v0 IP block > > - items: > > - enum: > > - allwinner,sun20i-d1-clint > > @@ -45,14 +45,9 @@ properties: > > description: For the QEMU virt machine only > > > > description: > > - Should be "<vendor>,<chip>-clint" and "sifive,clint<version>". > > - Supported compatible strings are - > > - "sifive,fu540-c000-clint" for the SiFive CLINT v0 as integrated > > - onto the SiFive FU540 chip, "canaan,k210-clint" for the SiFive > > - CLINT v0 as integrated onto the Canaan Kendryte K210 chip, and > > - "sifive,clint0" for the SiFive CLINT v0 IP block with no chip > > - integration tweaks. > > - Please refer to sifive-blocks-ip-versioning.txt for details > > > + Should be "<vendor>,<chip>-clint", followed by "sifive,clint<version>" > > + when compatible with a SiFive CLINT. Please refer to > > + sifive-blocks-ip-versioning.txt for details regarding the latter. > > Does this section actually add any value at all? > By nature of oneOf structure above, such an ordering is required for > existing entries. For something not here, should we instead be noting > that sifive,clint0 is to be used when compatible with the SiFive/RISC-V > clint, rather than doing a sifive-blocks-ip-versioning.txt dance? I considered removing the paragraph. But I kept it, just not to loose the reference to sifive-blocks-ip-versioning.txt, which someone might find useful. > As it stands though, patch is an improvement, so: > Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Thanks! Gr{oetje,eeting}s, Geert
On Wed, May 10, 2023 at 03:27:24PM +0200, Geert Uytterhoeven wrote: > Replace the sentences in the description listing some supported variants > by comments on the individual compatible values, to ease future > maintenance. While at it, restore alphabetical sort order. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Palmer has assigned this one to me on the RISC-V patchwork, any objections to me taking it via the riscv-dt tree? There's some other patches for a new platform thats almost read touching the file too, so (to me) would probably make sense to take. Cheers, Conor.
On Thu, May 18, 2023 at 10:10:00PM +0100, Conor Dooley wrote: > On Wed, May 10, 2023 at 03:27:24PM +0200, Geert Uytterhoeven wrote: > > Replace the sentences in the description listing some supported variants > > by comments on the individual compatible values, to ease future > > maintenance. While at it, restore alphabetical sort order. > > > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > > Palmer has assigned this one to me on the RISC-V patchwork, any objections > to me taking it via the riscv-dt tree? There's some other patches for a > new platform thats almost read touching the file too, so (to me) would > probably make sense to take. Given the silence, I've picked it up. Scream and I can drop it again :) Applied to riscv-dt-for-next, thanks! [1/1] dt-bindings: timer: sifive,clint: Clean up compatible value section https://git.kernel.org/conor/c/1bd2339df1b5 Thanks, Conor
diff --git a/Documentation/devicetree/bindings/timer/sifive,clint.yaml b/Documentation/devicetree/bindings/timer/sifive,clint.yaml index 94bef9424df1bc6a..34a81510678134eb 100644 --- a/Documentation/devicetree/bindings/timer/sifive,clint.yaml +++ b/Documentation/devicetree/bindings/timer/sifive,clint.yaml @@ -29,11 +29,11 @@ properties: oneOf: - items: - enum: - - sifive,fu540-c000-clint - - starfive,jh7100-clint - - starfive,jh7110-clint - - canaan,k210-clint - - const: sifive,clint0 + - canaan,k210-clint # Canaan Kendryte K210 + - sifive,fu540-c000-clint # SiFive FU540 + - starfive,jh7100-clint # StarFive JH7100 + - starfive,jh7110-clint # StarFive JH7110 + - const: sifive,clint0 # SiFive CLINT v0 IP block - items: - enum: - allwinner,sun20i-d1-clint @@ -45,14 +45,9 @@ properties: description: For the QEMU virt machine only description: - Should be "<vendor>,<chip>-clint" and "sifive,clint<version>". - Supported compatible strings are - - "sifive,fu540-c000-clint" for the SiFive CLINT v0 as integrated - onto the SiFive FU540 chip, "canaan,k210-clint" for the SiFive - CLINT v0 as integrated onto the Canaan Kendryte K210 chip, and - "sifive,clint0" for the SiFive CLINT v0 IP block with no chip - integration tweaks. - Please refer to sifive-blocks-ip-versioning.txt for details + Should be "<vendor>,<chip>-clint", followed by "sifive,clint<version>" + when compatible with a SiFive CLINT. Please refer to + sifive-blocks-ip-versioning.txt for details regarding the latter. reg: maxItems: 1