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: 508774 Delivered-To: patch@linaro.org Received: by 2002:a02:8629:0:0:0:0:0 with SMTP id e38csp1496217jai; Fri, 10 Sep 2021 09:51:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw7CLRPWruiKe4kg5hYyFVC4/XEOq7sEvIrUOaY6T94NX9GAzi110Ri2fKuHz7ik5NT9o2R X-Received: by 2002:a6b:7f42:: with SMTP id m2mr8019322ioq.86.1631292717141; Fri, 10 Sep 2021 09:51:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631292717; cv=none; d=google.com; s=arc-20160816; b=jmwK066DKKVzqrGvIpQJ4LlXQS3YfQ9OCrd3SMYlq9Z7qog9hVGOIlBGJN/eGpI2BW /5m9pwzjKaXw/mcJWvPKgxVr4pkQyqiNKmxLmlK+j5JajP9COb1ZXNouNIY7ndZiV41u YX/49UOfUB4Pqmynxvicaccad/sXqF6xAMCXvdpGTcRLWKK2+vJBjKO7SdEH/Ll/gTBA hdZHsI6mblnDaU3BOvCVFAJN0jxUdj0jvv7gUuo4yqzvlupjlIoZjTjCPIqSQk+U6zyU Oq9tGFrROkxdqcAn18sM3f+BiZcfnb5JwBy5ey/mtac7kFe9whCsSE0P2VQQHG+Wazhy H1QA== 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=3fjHrC7rWcF9dMNWywAFcF4cWpH6lABHS4xRvn07uCE=; b=KbyDcpzWOrtI2c4TK11tl4cLaixHPamJUdw88ZTFzU1fTP1R/z4ejNqn3Y8waIh1FU htDRyDwM/OIkjF5+DNWoYDm6IBFWvlic9AHoe2VJB9p+9A1EhCdexX2hRdZBBsJrx7W0 QbjrOwS4AoeuU+i6/8LOnfkXuF7htPJFiPVHfn6TjB9SLWyp8MSdgNrJSxk7/98APpE6 sP60acLeg3JOKAUSPEUinmMUirZRWcJjIIUTJqwYwi76aQ+qW09NkVFyaVm74+qtMy/6 txeDxD/FpGEwTj30InbwrAq9lP+5czisQQuFPnPCwJu1E3k5q5UYG5d6Ity1H+s4hkoZ e/6w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-spi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-spi-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c16si4743403ili.126.2021.09.10.09.51.57; Fri, 10 Sep 2021 09:51:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-spi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-spi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-spi-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229466AbhIJQxH (ORCPT + 1 other); Fri, 10 Sep 2021 12:53:07 -0400 Received: from mail-oo1-f46.google.com ([209.85.161.46]:46733 "EHLO mail-oo1-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229448AbhIJQxH (ORCPT ); Fri, 10 Sep 2021 12:53:07 -0400 Received: by mail-oo1-f46.google.com with SMTP id q26-20020a4adc5a000000b002918a69c8eeso798724oov.13; 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=dNFaDpNMFJNecRWRJQccpVQZqT0iJ55YOZ4EhgDzP6NSeOSENF4ROMh4nR+C7N0cHg LdQn6KFFKK6QMjf3rsHimze4elDhCgcCGy/tL51i2MsLV/sYx/9M/z6yF/E7hOfYTYgL G229yZgtF6mQ080/svhcmpiBFpanOrnQqDKODCBfzuj26tCE4opjPs5kjDR/bwMuwk9y UUDsX5dQggDl6HhS2kxtcqcV8h7MN/T6QTylBfX4Q1884r40vHxIPZ/YChYLpk4hLgxO d77nufkOrIflIVy/K0kx/7lHIVdCzPSYXZ+dCrjBZa8K8D0LmhGeKByiTcIGljo2MzUO IUdg== X-Gm-Message-State: AOAM531b6SC+Ont4jEbAduuwwSQKDTnRxd14j4R9k1c4tUdv+fzv38hv r9lQLD6a1+GxQUATarJ8cnDDLfhQ/w== 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 Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org '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 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) -- 2.30.2 Acked-by: Mark Brown Acked-by: Aswath Govindraju 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