From patchwork Fri Sep 10 16:51:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 12485623 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.0 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 726AFC4332F for ; Fri, 10 Sep 2021 16:51:58 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2B2F2611AD for ; Fri, 10 Sep 2021 16:51:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2B2F2611AD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 20E0F6EA42; Fri, 10 Sep 2021 16:51:57 +0000 (UTC) Received: from mail-oo1-f53.google.com (mail-oo1-f53.google.com [209.85.161.53]) by gabe.freedesktop.org (Postfix) with ESMTPS id 938456EA42; Fri, 10 Sep 2021 16:51:55 +0000 (UTC) Received: by mail-oo1-f53.google.com with SMTP id v20-20020a4a2554000000b0028f8cc17378so815911ooe.0; Fri, 10 Sep 2021 09:51:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3fjHrC7rWcF9dMNWywAFcF4cWpH6lABHS4xRvn07uCE=; b=n0pLQC/m1h5A1fn2MzWqrUX4oQarb7I7knb3VW4HsCxe2kMxM9rGP+PkMf6kSyHydx bJbu7aiNg6qs2s8MGulF60T8xpksuVjtATtboNvB4wh+8jXrQg65ZvK+KKz3m1nUHiAD 3xnNpGxISsktCzNdBuAsdHO5W7XBRivlmEg8zOt7D/tPqM1FBQmhYhnpGU2yZze0Aak4 9p3hoK+ECAOWUXM6d/MId5N0H/HLe+r1nbjNdhlAFbQnA/hDC29ACO5bWSWmL2jhiuCI LRQ9/YguJBnotN0AjUNp1c9TVSwB9YYv0jennGtFTuUk+8LmL92LvtLX/MSbjnu57Hvo y3uQ== X-Gm-Message-State: AOAM531HwcqjLqOf2YkSdpoRRNSdQXtvfhxL1EngERpaEe+nw3EJu118 3vTreO2zB90fPeky9Y7F9w== X-Google-Smtp-Source: ABdhPJyUedNY2XQSRkDXYf15LP5DG4AvPSI+WgwkX0ecJs/T2gYdw2UpbTWOv/R1eADi4gUxBwt0FQ== X-Received: by 2002:a4a:33d6:: with SMTP id q205mr5077583ooq.83.1631292714765; Fri, 10 Sep 2021 09:51:54 -0700 (PDT) Received: from xps15.herring.priv (66-90-148-213.dyn.grandenetworks.net. [66.90.148.213]) by smtp.googlemail.com with ESMTPSA id f17sm1347223otl.24.2021.09.10.09.51.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Sep 2021 09:51:54 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org Cc: Rob Clark , Sean Paul , Mark Brown , Wim Van Sebroeck , Guenter Roeck , 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 Subject: [PATCH] dt-bindings: More use 'enum' instead of 'oneOf' plus 'const' entries Date: Fri, 10 Sep 2021 11:51:53 -0500 Message-Id: <20210910165153.2843871-1-robh@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" '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 Acked-by: Mark Brown Acked-by: Guenter Roeck Acked-by: Aswath Govindraju --- .../bindings/display/msm/dsi-phy-7nm.yaml | 8 ++++---- .../devicetree/bindings/spi/omap-spi.yaml | 6 +++--- .../bindings/watchdog/maxim,max63xx.yaml | 14 +++++++------- 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