From patchwork Tue Feb 2 20:55:44 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: 374674 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp543968jah; Tue, 2 Feb 2021 12:55:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJw4QN3FOWaSrT6BuSIurnSXlMDqgCjVHCapbVrEF3Hsy3Hr/bJRPwjSGPDLCkgewtmGn7uh X-Received: by 2002:a63:ac19:: with SMTP id v25mr23659091pge.258.1612299358947; Tue, 02 Feb 2021 12:55:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612299358; cv=none; d=google.com; s=arc-20160816; b=hXZJBaRQXMSl2dwwqP9xAI1SpP6sDCk7ny7hYOavwqoX0BKr5B5h+TNVnuiFf5p8n1 Rhe458zMgYPwjhVVGJm4sOpqounrQSjd8GPPJltbMuMhPN/c7w65vWwqTy2fh4tVW/Zt 63uc42+54yESyz1D88hVjiTybrjxRz0x38qCq+Y+wbTht/vc+GkcC4xS3i72y1x+3q7a N86R0ZdY98bBRdq8dGndWe4QuF9BSQ/KPetR4eBed6I1XDyULTSvdGxjRTY6A6QezthU UabPe6Yvgc9QPOW6GHbL9A+fmqGc9X+PBknr9h+8ojlKA6Y7/busyjskzlGvw/FQxHzt QQ6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:delivered-to; bh=B8ScqcUCDvLljF9AYE/UZDAOQwv3EotJRYwVyUxCyY4=; b=TVFUwZU1EM1JA+cykgnr7Wg0+Noj9z+tPNFCttQ3gfCr3IXj7NrRlBfSdB7mdol8lO uXMKDi/QFMmiloTsisWsPgIlA+za8nZ/t45n/DjI8tY93LLlcYShQJLWht9IYMaDo/LW Gb6YjztK5qjPbvDnPJSXturLrGCj/uGcMx6zOBeFSM50dG5fAsTjDEjjQKJH+aov+y5y E8IgxBJ8pkyfGffug1MEI5jG+Q0MIRAtHg12YAPFE4RARjh/EyQysWKJnXhaB4uze5Nn sZsDFuGICML6rOErbaS+iMr0N4WnEELY2rI7lvB0zNv7yIuI3FBk48+dlaZnOca23cCX sL2w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id ml20si574165pjb.34.2021.02.02.12.55.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 12:55:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 97C0689CCB; Tue, 2 Feb 2021 20:55:55 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) by gabe.freedesktop.org (Postfix) with ESMTPS id E2E9989CCB for ; Tue, 2 Feb 2021 20:55:53 +0000 (UTC) Received: by mail-oi1-f179.google.com with SMTP id g69so24274989oib.12 for ; Tue, 02 Feb 2021 12:55:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6WKE/3EQ/xJ6AJH5xmJE9YBaYDJN1xjVTBGt+kvQ65Y=; b=fbJgMAf0bo4m1u8bcdA+qSQ8EhwxVqowYqp8q+Xzld/yV9UzBbaVrqYRQ5TGJ+ld3m DBFYGEMj9RTZQSB5G4yeWqpMuQBpQI1YHpBtpMSE10xXunzYnTYrJ5QelJVuoBwps5LM 4L3G4q2dw83GFoeqjB0cE/n5fD1E7saROUfxSW48UtHONS91TXfEBHFkVUB13PXOB5SE ro+tP5fQv8Re648m2merKkBvCKUMdkUpeIxud9GgI00bbMPCpQEfaLSnMC3xVQp3Z31p yuyZWVABXj02wVFdUuJ+ZSdhe/YPNg4cLtFfPas4QdJwqwPFMCZVogQF1OyJ362uN9gT Aetg== X-Gm-Message-State: AOAM531WQ4Bu+2DUXTd+xUsCwUM06AhSgAo1w0DgcoU9jTfTqBK9Vnv7 VSJ5O++djV9PNX4LXYGzbg== X-Received: by 2002:aca:dc07:: with SMTP id t7mr4037098oig.15.1612299353146; Tue, 02 Feb 2021 12:55:53 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id k15sm4206otp.10.2021.02.02.12.55.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 12:55:52 -0800 (PST) From: Rob Herring To: devicetree@vger.kernel.org Subject: [PATCH 3/3] dt-bindings: Fix errors in 'if' schemas Date: Tue, 2 Feb 2021 14:55:44 -0600 Message-Id: <20210202205544.24812-3-robh@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210202205544.24812-1-robh@kernel.org> References: <20210202205544.24812-1-robh@kernel.org> 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: , Cc: Ulf Hansson , Tomer Maimon , Geert Uytterhoeven , Andrew Jeffery , Vincent Cheng , dri-devel@lists.freedesktop.org, Tali Perry , Daniel Palmer , linux-i2c@vger.kernel.org, Pavel Machek , Will Deacon , linux-clk@vger.kernel.org, linux-leds@vger.kernel.org, Florian Fainelli , Herbert Xu , Joerg Roedel , Daniel Lezcano , Vinod Koul , Kishon Vijay Abraham I , Bartosz Golaszewski , Chen-Yu Tsai , Joel Stanley , Guenter Roeck , linux-watchdog@vger.kernel.org, Ray Jui , linux-gpio@vger.kernel.org, Wim Van Sebroeck , Scott Branden , Avi Fishman , Yoshihiro Shimoda , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Stephen Boyd , iommu@lists.linux-foundation.org, linux-crypto@vger.kernel.org, "David S. Miller" , Nicolas Saenz Julienne Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Properties in if/then schemas weren't getting checked by the meta-schemas. Enabling meta-schema checks finds several errors. The use of an 'items' schema (as opposed to the list form) is wrong in some cases as it applies to all entries. 'contains' is the correct schema to use in the case of multiple entries. Cc: Herbert Xu Cc: "David S. Miller" Cc: Maxime Ripard Cc: Chen-Yu Tsai Cc: Eric Anholt Cc: Nicolas Saenz Julienne Cc: Florian Fainelli Cc: Ray Jui Cc: Scott Branden Cc: Pavel Machek Cc: Ulf Hansson Cc: Kishon Vijay Abraham I Cc: Vinod Koul Cc: Geert Uytterhoeven Cc: Linus Walleij Cc: Daniel Lezcano Cc: linux-crypto@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: linux-leds@vger.kernel.org Cc: linux-mmc@vger.kernel.org Cc: linux-gpio@vger.kernel.org Signed-off-by: Rob Herring --- .../devicetree/bindings/crypto/allwinner,sun8i-ce.yaml | 3 +-- .../devicetree/bindings/display/brcm,bcm2835-hvs.yaml | 2 +- Documentation/devicetree/bindings/leds/ti,tca6507.yaml | 1 + Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml | 2 +- Documentation/devicetree/bindings/phy/brcm,sata-phy.yaml | 3 +-- .../devicetree/bindings/phy/renesas,usb2-phy.yaml | 5 ++--- .../devicetree/bindings/pinctrl/renesas,pfc.yaml | 9 ++++----- .../bindings/timer/allwinner,sun5i-a13-hstimer.yaml | 3 +-- 8 files changed, 12 insertions(+), 16 deletions(-) -- 2.27.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel Acked-By: Vinod Koul Acked-by: Geert Uytterhoeven diff --git a/Documentation/devicetree/bindings/crypto/allwinner,sun8i-ce.yaml b/Documentation/devicetree/bindings/crypto/allwinner,sun8i-ce.yaml index 7a60d84289cc..6ab07eba7778 100644 --- a/Documentation/devicetree/bindings/crypto/allwinner,sun8i-ce.yaml +++ b/Documentation/devicetree/bindings/crypto/allwinner,sun8i-ce.yaml @@ -46,8 +46,7 @@ properties: if: properties: compatible: - items: - const: allwinner,sun50i-h6-crypto + const: allwinner,sun50i-h6-crypto then: properties: clocks: diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml index e826ab0adb75..2e8566f47e63 100644 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml @@ -36,7 +36,7 @@ if: properties: compatible: contains: - const: brcm,bcm2711-hvs" + const: brcm,bcm2711-hvs then: required: diff --git a/Documentation/devicetree/bindings/leds/ti,tca6507.yaml b/Documentation/devicetree/bindings/leds/ti,tca6507.yaml index 94c307c98762..32c600387895 100644 --- a/Documentation/devicetree/bindings/leds/ti,tca6507.yaml +++ b/Documentation/devicetree/bindings/leds/ti,tca6507.yaml @@ -69,6 +69,7 @@ patternProperties: if: patternProperties: "^gpio@[0-6]$": + type: object properties: compatible: contains: diff --git a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml index 6bbf29b5c239..6c13703b31db 100644 --- a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml +++ b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml @@ -123,7 +123,7 @@ required: if: properties: compatible: - items: + contains: enum: - renesas,sdhi-r7s72100 - renesas,sdhi-r7s9210 diff --git a/Documentation/devicetree/bindings/phy/brcm,sata-phy.yaml b/Documentation/devicetree/bindings/phy/brcm,sata-phy.yaml index 58c3ef8004ad..04edda504ab6 100644 --- a/Documentation/devicetree/bindings/phy/brcm,sata-phy.yaml +++ b/Documentation/devicetree/bindings/phy/brcm,sata-phy.yaml @@ -99,8 +99,7 @@ patternProperties: if: properties: compatible: - items: - const: brcm,iproc-ns2-sata-phy + const: brcm,iproc-ns2-sata-phy then: properties: reg: diff --git a/Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml b/Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml index 829e8c7e467a..0f358d5b84ef 100644 --- a/Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml +++ b/Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml @@ -81,9 +81,8 @@ properties: if: properties: compatible: - items: - enum: - - renesas,usb2-phy-r7s9210 + contains: + const: renesas,usb2-phy-r7s9210 then: required: - clock-names diff --git a/Documentation/devicetree/bindings/pinctrl/renesas,pfc.yaml b/Documentation/devicetree/bindings/pinctrl/renesas,pfc.yaml index 5b5b1b9d2ec7..5d3947902f2d 100644 --- a/Documentation/devicetree/bindings/pinctrl/renesas,pfc.yaml +++ b/Documentation/devicetree/bindings/pinctrl/renesas,pfc.yaml @@ -76,11 +76,10 @@ required: if: properties: compatible: - items: - enum: - - renesas,pfc-r8a73a4 - - renesas,pfc-r8a7740 - - renesas,pfc-sh73a0 + enum: + - renesas,pfc-r8a73a4 + - renesas,pfc-r8a7740 + - renesas,pfc-sh73a0 then: required: - interrupts-extended diff --git a/Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.yaml b/Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.yaml index 40fc4bcb3145..b6a6d03a08b2 100644 --- a/Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.yaml +++ b/Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.yaml @@ -46,8 +46,7 @@ required: if: properties: compatible: - items: - const: allwinner,sun5i-a13-hstimer + const: allwinner,sun5i-a13-hstimer then: properties: