From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 209BDC433FE for ; Fri, 10 Sep 2021 17:11:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0427B611C5 for ; Fri, 10 Sep 2021 17:11:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230452AbhIJRM4 (ORCPT ); Fri, 10 Sep 2021 13:12:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229664AbhIJRM4 (ORCPT ); Fri, 10 Sep 2021 13:12:56 -0400 Received: from mail-ot1-x330.google.com (mail-ot1-x330.google.com [IPv6:2607:f8b0:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D00ABC061574; Fri, 10 Sep 2021 10:11:44 -0700 (PDT) Received: by mail-ot1-x330.google.com with SMTP id q11-20020a9d4b0b000000b0051acbdb2869so3163449otf.2; Fri, 10 Sep 2021 10:11:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=2HAZ66n8XyPtrBgaRn37Y3arskzhFWBsMyDucYRHQ+4=; b=RDaWgHMffMLm3uyBxhOkBVfSCT0Zk83hg5MpXcb6aJ6MT26HBAlrp7rEyBj7ZYJuR1 f5reWuu6Q36j4s1sQwOphkrlnSXNKnIMzwkekPOTF9eA2FcHDi/uaSh8c73F4lY1cdod Y7zt1Nk2Pof8Vyt0XsHDLDJiDpfzuqcRTiefMd1+TGhYGXd4jMc/V0phd1CJwox/Yc0m 82Glauuneb1RG6UjBpvcHEMzbSCSAJ+og3o/n79l7HC5/4WMdg+pizHBbig3NTTU7iAQ KlVJD/BCkeXrAm9L6iOP36rGAUFN6hjhu/gdgoY4RI/Bizovfm3CXLgLhfWtzb66i41g 68FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=2HAZ66n8XyPtrBgaRn37Y3arskzhFWBsMyDucYRHQ+4=; b=gjYYPx4mgxvVUch3z8zGRfrkM18tGrwLP0qhAt4XtaVmHyLT+PRfOSuvZJBNwYB9T1 Rn2vzameEJSDLcE5IaK4JrRAscftjDcO+MXI431xhu8YbdwfBeW5He3bGiCvLUE3qsC9 X9vJwqJvGbwKk27QOesMzccASqmoQ/BL5LrrTZX53H1fM0X8eu7qaX8A6+HozGJwP3IR QHljEvEx6Ljhanjdy3wCa1w4fz9aFuHPLOi4fZrzJlBGQf+6XXenN4d1E7nEEDloS35M rSnd8noNeizxcLWXaRTXoaWYSEppy0K7fjZn5z3BOrk9GJeUHrI+gzVjjmmEdDK2GTQh 0Vpg== X-Gm-Message-State: AOAM531cGy4AtxUWH0eTzR55mn7+u/SyYE1pg0HAkadB1MumAUPhhol7 5oTPwfIa3rfZd2ynsKeTptRGxohEmxU= X-Google-Smtp-Source: ABdhPJzQhrxd77ILY6qcA5Sww9nwuttExHwDPJ3UDbQcLPJ+akzxSqBiMt+koNmgPX+0IZNWbWO6hQ== X-Received: by 2002:a9d:7416:: with SMTP id n22mr5610917otk.309.1631293903649; Fri, 10 Sep 2021 10:11:43 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id w23sm1415041oih.4.2021.09.10.10.11.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 10 Sep 2021 10:11:43 -0700 (PDT) Sender: Guenter Roeck Subject: Re: [PATCH] dt-bindings: More use 'enum' instead of 'oneOf' plus 'const' entries To: Rob Herring , devicetree@vger.kernel.org Cc: Rob Clark , Sean Paul , Mark Brown , Wim Van Sebroeck , Jonathan Marek , Aswath Govindraju , Marc Zyngier , Linus Walleij , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-spi@vger.kernel.org, linux-watchdog@vger.kernel.org References: <20210910165153.2843871-1-robh@kernel.org> From: Guenter Roeck Message-ID: <84a288a9-336e-78c6-a971-b12710e1b502@roeck-us.net> Date: Fri, 10 Sep 2021 10:11:40 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210910165153.2843871-1-robh@kernel.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On 9/10/21 9:51 AM, Rob Herring wrote: > 'enum' is equivalent to 'oneOf' with a list of 'const' entries, but 'enum' > is more concise and yields better error messages. > > Fix a couple more cases which have appeared. > > Cc: Rob Clark > Cc: Sean Paul > Cc: Mark Brown > Cc: Wim Van Sebroeck > Cc: Guenter Roeck > Cc: Jonathan Marek > Cc: Aswath Govindraju > Cc: Marc Zyngier > Cc: Linus Walleij > Cc: dri-devel@lists.freedesktop.org > Cc: freedreno@lists.freedesktop.org > Cc: linux-spi@vger.kernel.org > Cc: linux-watchdog@vger.kernel.org > Signed-off-by: Rob Herring > --- > .../bindings/display/msm/dsi-phy-7nm.yaml | 8 ++++---- > .../devicetree/bindings/spi/omap-spi.yaml | 6 +++--- > .../bindings/watchdog/maxim,max63xx.yaml | 14 +++++++------- For watchdog: Acked-by: Guenter Roeck > 3 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml b/Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml > index 4265399bb154..c851770bbdf2 100644 > --- a/Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml > +++ b/Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml > @@ -14,10 +14,10 @@ allOf: > > properties: > compatible: > - oneOf: > - - const: qcom,dsi-phy-7nm > - - const: qcom,dsi-phy-7nm-8150 > - - const: qcom,sc7280-dsi-phy-7nm > + enum: > + - qcom,dsi-phy-7nm > + - qcom,dsi-phy-7nm-8150 > + - qcom,sc7280-dsi-phy-7nm > > reg: > items: > diff --git a/Documentation/devicetree/bindings/spi/omap-spi.yaml b/Documentation/devicetree/bindings/spi/omap-spi.yaml > index e55538186cf6..9952199cae11 100644 > --- a/Documentation/devicetree/bindings/spi/omap-spi.yaml > +++ b/Documentation/devicetree/bindings/spi/omap-spi.yaml > @@ -84,9 +84,9 @@ unevaluatedProperties: false > if: > properties: > compatible: > - oneOf: > - - const: ti,omap2-mcspi > - - const: ti,omap4-mcspi > + enum: > + - ti,omap2-mcspi > + - ti,omap4-mcspi > > then: > properties: > diff --git a/Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml b/Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml > index f2105eedac2c..ab9641e845db 100644 > --- a/Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml > +++ b/Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml > @@ -15,13 +15,13 @@ maintainers: > > properties: > compatible: > - oneOf: > - - const: maxim,max6369 > - - const: maxim,max6370 > - - const: maxim,max6371 > - - const: maxim,max6372 > - - const: maxim,max6373 > - - const: maxim,max6374 > + enum: > + - maxim,max6369 > + - maxim,max6370 > + - maxim,max6371 > + - maxim,max6372 > + - maxim,max6373 > + - maxim,max6374 > > reg: > description: This is a 1-byte memory-mapped address >