From patchwork Tue Feb 2 20:55:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 1434947 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DVcZf2r2Mz9sWD for ; Wed, 3 Feb 2021 07:57:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233462AbhBBU4c (ORCPT ); Tue, 2 Feb 2021 15:56:32 -0500 Received: from mail-ot1-f46.google.com ([209.85.210.46]:43278 "EHLO mail-ot1-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230002AbhBBU4a (ORCPT ); Tue, 2 Feb 2021 15:56:30 -0500 Received: by mail-ot1-f46.google.com with SMTP id v1so21244231ott.10; Tue, 02 Feb 2021 12:56:13 -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:mime-version :content-transfer-encoding; bh=YcDLZh3Cqrzft9rIs/Kq27AfKEBZ9vkw9dbEJP0DrjM=; b=Y7rMbq9cJm7XnPC0pZuVKewonHDiuxEz/xL/aouk8lRqfkX2SdJJQ6viO7MQnE8l8S HfeiwAZQtKDQmdDWj4PFsEKIvR/hg8w+Ayly1z+r1TEhOaWTGE3aWzogxG8nUf+QMUJh MLv7v5hxjf+33ZS3YEDu4l25BimQ/Vw8u3Zk/tgzxOWXRe66kMSa7rIyxVvfUeqt0o3K QaNBoWOeDoYdHdIiAdqBheULxZfOLpONCKkXcfaSFT3qARhoict0s8dVz6soWYtgqZwv km8VwhlZs84TYGZ2sytM4/IiodccmBJzKRzE7Q7+ibGNUOCHAAdzmBptsAl7Ieyoi1y0 5hlA== X-Gm-Message-State: AOAM530VLVPgyzAudXUZ7/n06w8cEpnk7NkMj4ihz/E762XVDpG8jT9z 3xdZ34q2fNC7q6IrVjvZyadZkciSPQ== X-Google-Smtp-Source: ABdhPJz+bxVqZHcA6WQ+rYUVLbRdjFrxDoLmtrg5Q88bRT0/dSLxHv+dlmm7nH5rNIdmYX/wLxVRrA== X-Received: by 2002:a05:6830:1041:: with SMTP id b1mr16514781otp.335.1612299347994; Tue, 02 Feb 2021 12:55:47 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 12:55:46 -0800 (PST) From: Rob Herring To: devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Stephen Boyd , Maxime Ripard , Chen-Yu Tsai , Linus Walleij , Herbert Xu , "David S. Miller" , Daniel Palmer , Bartosz Golaszewski , Avi Fishman , Tomer Maimon , Tali Perry , Joerg Roedel , Will Deacon , Andrew Jeffery , Joel Stanley , Wim Van Sebroeck , Guenter Roeck , Yoshihiro Shimoda , Vincent Cheng , linux-clk@vger.kernel.org, linux-crypto@vger.kernel.org, linux-gpio@vger.kernel.org, linux-i2c@vger.kernel.org, iommu@lists.linux-foundation.org, linux-watchdog@vger.kernel.org Subject: [PATCH 1/3] dt-bindings: Fix undocumented compatible strings in examples Date: Tue, 2 Feb 2021 14:55:42 -0600 Message-Id: <20210202205544.24812-1-robh@kernel.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Running 'dt-validate -m' will flag any compatible strings missing a schema. Fix all the errors found in DT binding examples. Most of these are just typos. Cc: Stephen Boyd Cc: Maxime Ripard Cc: Chen-Yu Tsai Cc: Linus Walleij Cc: Herbert Xu Cc: "David S. Miller" Cc: Daniel Palmer Cc: Bartosz Golaszewski Cc: Avi Fishman Cc: Tomer Maimon Cc: Tali Perry Cc: Joerg Roedel Cc: Will Deacon Cc: Andrew Jeffery Cc: Joel Stanley Cc: Wim Van Sebroeck Cc: Guenter Roeck Cc: Yoshihiro Shimoda Cc: Vincent Cheng Cc: linux-clk@vger.kernel.org Cc: linux-crypto@vger.kernel.org Cc: linux-gpio@vger.kernel.org Cc: linux-i2c@vger.kernel.org Cc: iommu@lists.linux-foundation.org Cc: linux-watchdog@vger.kernel.org Signed-off-by: Rob Herring Reviewed-by: Guenter Roeck Reviewed-by: Andrew Jeffery Acked-by: Maxime Ripard Reviewed-by: Linus Walleij Reviewed-by: Daniel Palmer Reviewed-by: Yoshihiro Shimoda Acked-by: Wolfram Sang # for I2C --- .../bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml | 2 +- Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml | 4 ++-- Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml | 2 +- Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml | 2 +- .../devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml | 2 +- .../devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml | 2 +- .../devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 2 +- .../devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 2 +- .../devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 2 +- Documentation/devicetree/bindings/ptp/ptp-idtcm.yaml | 4 +--- Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml | 4 ++-- 11 files changed, 13 insertions(+), 15 deletions(-) diff --git a/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml b/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml index fa0ee03a527f..53cc6df0df96 100644 --- a/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml +++ b/Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clocks.yaml @@ -18,7 +18,7 @@ properties: const: 1 compatible: - const: allwinner,sun9i-a80-usb-clocks + const: allwinner,sun9i-a80-usb-clks reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml b/Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml index eb241587efd1..118c5543e037 100644 --- a/Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml +++ b/Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml @@ -66,8 +66,8 @@ properties: - arm,syscon-icst525-integratorcp-cm-mem - arm,integrator-cm-auxosc - arm,versatile-cm-auxosc - - arm,impd-vco1 - - arm,impd-vco2 + - arm,impd1-vco1 + - arm,impd1-vco2 clocks: description: Parent clock for the ICST VCO diff --git a/Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml b/Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml index 1465c9ebaf93..1d48ac712b23 100644 --- a/Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml +++ b/Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml @@ -66,7 +66,7 @@ examples: #include main_crypto: crypto@4e00000 { - compatible = "ti,j721-sa2ul"; + compatible = "ti,j721e-sa2ul"; reg = <0x4e00000 0x1200>; power-domains = <&k3_pds 264 TI_SCI_PD_EXCLUSIVE>; dmas = <&main_udmap 0xc000>, <&main_udmap 0x4000>, diff --git a/Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml b/Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml index 1f2ef408bb43..fe1e1c63ffe3 100644 --- a/Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml +++ b/Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml @@ -46,7 +46,7 @@ examples: #include gpio: gpio@207800 { - compatible = "mstar,msc313e-gpio"; + compatible = "mstar,msc313-gpio"; #gpio-cells = <2>; reg = <0x207800 0x200>; gpio-controller; diff --git a/Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml b/Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml index e3ef2d36f372..128444942aec 100644 --- a/Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml +++ b/Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml @@ -17,7 +17,7 @@ maintainers: properties: compatible: - const: nuvoton,npcm7xx-i2c + const: nuvoton,npcm750-i2c reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml index cde1afa8dfd6..349633108bbd 100644 --- a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml +++ b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml @@ -93,7 +93,7 @@ examples: #include ipmmu_mx: iommu@fe951000 { - compatible = "renasas,ipmmu-r8a7791", "renasas,ipmmu-vmsa"; + compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa"; reg = <0xfe951000 0x1000>; interrupts = , ; diff --git a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml index 54631dc1adb0..5dbb84049ff6 100644 --- a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml +++ b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml @@ -63,7 +63,7 @@ examples: reg = <0x1e6e2000 0x1a8>; pinctrl: pinctrl { - compatible = "aspeed,g4-pinctrl"; + compatible = "aspeed,ast2400-pinctrl"; pinctrl_i2c3_default: i2c3_default { function = "I2C3"; diff --git a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml index a90c0fe0495f..ad1c33364b38 100644 --- a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml +++ b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml @@ -81,7 +81,7 @@ examples: reg = <0x1e6e2000 0x1a8>; pinctrl: pinctrl { - compatible = "aspeed,g5-pinctrl"; + compatible = "aspeed,ast2500-pinctrl"; aspeed,external-nodes = <&gfx>, <&lhc>; pinctrl_i2c3_default: i2c3_default { diff --git a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml index c78ab7e2eee7..ad91c0bc54da 100644 --- a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml +++ b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml @@ -95,7 +95,7 @@ examples: reg = <0x1e6e2000 0xf6c>; pinctrl: pinctrl { - compatible = "aspeed,g6-pinctrl"; + compatible = "aspeed,ast2600-pinctrl"; pinctrl_pwm10g1_default: pwm10g1_default { function = "PWM10"; diff --git a/Documentation/devicetree/bindings/ptp/ptp-idtcm.yaml b/Documentation/devicetree/bindings/ptp/ptp-idtcm.yaml index 239b49fad805..658cec67743e 100644 --- a/Documentation/devicetree/bindings/ptp/ptp-idtcm.yaml +++ b/Documentation/devicetree/bindings/ptp/ptp-idtcm.yaml @@ -59,9 +59,7 @@ additionalProperties: false examples: - | - i2c@1 { - compatible = "abc,acme-1234"; - reg = <0x01 0x400>; + i2c { #address-cells = <1>; #size-cells = <0>; phc@5b { diff --git a/Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml b/Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml index c1348db59374..054584d7543a 100644 --- a/Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml @@ -57,8 +57,8 @@ examples: */ #include - watchdog0: rti@2200000 { - compatible = "ti,rti-wdt"; + watchdog@2200000 { + compatible = "ti,j7-rti-wdt"; reg = <0x2200000 0x100>; clocks = <&k3_clks 252 1>; power-domains = <&k3_pds 252 TI_SCI_PD_EXCLUSIVE>; From patchwork Tue Feb 2 20:55:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 1434945 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DVcZd4hWXz9sX3 for ; Wed, 3 Feb 2021 07:57:29 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233928AbhBBU4e (ORCPT ); Tue, 2 Feb 2021 15:56:34 -0500 Received: from mail-ot1-f44.google.com ([209.85.210.44]:38683 "EHLO mail-ot1-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232785AbhBBU4c (ORCPT ); Tue, 2 Feb 2021 15:56:32 -0500 Received: by mail-ot1-f44.google.com with SMTP id t25so11135328otc.5; Tue, 02 Feb 2021 12:56:16 -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=S/rEofJPqnkLlE8GJQFmVM1qahKIfCsQMC9dA4r5GHw=; b=Hp/M1WBJ6vNDx8V0gZq9eXVWg4ftMyJDcTB6JO23c8OTY9X9qNDY6CTdkRhkI+lvPl FEwS7dWqZg1mir+rtTOxBxTiql0729Rpzk1XybjNQRupV/FYhVvfIlWpz2pcM/6JPbGw g/mb2ROzfwngWahBuS+fdMFyj8AZsK7IVCt3wSC/q5wlVB1YRIIBgyl+PwlLPeCjNwIJ 4ae6ZQRWQeT0/ZUmHK0m7nUQynA3mGNG1F6sx6/M0erJrNyRwZil5+OTrCSbdsv9x9zQ RRXbV3yuSruYfiKD4o96tkzZ+4d54U15FIzCSAUzBeYB0Fuxs6UA/18W8Tt+kTkyB3Up iDdQ== X-Gm-Message-State: AOAM530z9LA3XxWruD8TACNWL4gXDISQS/BXUQAXz53RnxIzjNgTGv7Z TWVl8endEXdvUN6s/CIHA5R127KA5w== X-Google-Smtp-Source: ABdhPJyTfcE7Idlr0T2ZxzdhnhsjVGP931mbpfLbWa9WxA2Y7K5KDop7bsHZiJVP+WqqddEvlnnecQ== X-Received: by 2002:a9d:6643:: with SMTP id q3mr11847740otm.63.1612299350248; Tue, 02 Feb 2021 12:55:50 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 12:55:49 -0800 (PST) From: Rob Herring To: devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Stephen Boyd , Maxime Ripard , Chen-Yu Tsai , Linus Walleij , Herbert Xu , "David S. Miller" , Daniel Palmer , Bartosz Golaszewski , Avi Fishman , Tomer Maimon , Tali Perry , Joerg Roedel , Will Deacon , Andrew Jeffery , Joel Stanley , Wim Van Sebroeck , Guenter Roeck , Yoshihiro Shimoda , Vincent Cheng , linux-clk@vger.kernel.org, linux-crypto@vger.kernel.org, linux-gpio@vger.kernel.org, linux-i2c@vger.kernel.org, iommu@lists.linux-foundation.org, linux-watchdog@vger.kernel.org Subject: [PATCH 2/3] dt-bindings: iommu: renesas,ipmmu-vmsa: Make 'power-domains' conditionally required Date: Tue, 2 Feb 2021 14:55:43 -0600 Message-Id: <20210202205544.24812-2-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 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Fixing the compatible string typos results in an error in the example: Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.example.dt.yaml: iommu@fe951000: 'power-domains' is a required property Based on the dts files, a 'power-domains' property only exists on Gen 3 which can be conditioned on !renesas,ipmmu-vmsa. Cc: Joerg Roedel Cc: Will Deacon Cc: Yoshihiro Shimoda Cc: iommu@lists.linux-foundation.org Signed-off-by: Rob Herring Reviewed-by: Yoshihiro Shimoda --- .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml index 349633108bbd..dda44976acc1 100644 --- a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml +++ b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml @@ -76,7 +76,6 @@ required: - compatible - reg - '#iommu-cells' - - power-domains oneOf: - required: @@ -86,6 +85,17 @@ oneOf: additionalProperties: false +allOf: + - if: + properties: + compatible: + not: + contains: + const: renesas,ipmmu-vmsa + then: + required: + - power-domains + examples: - | #include 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 X-Patchwork-Id: 1434942 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DVcYw6BPDz9sWD for ; Wed, 3 Feb 2021 07:56:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234064AbhBBU4o (ORCPT ); Tue, 2 Feb 2021 15:56:44 -0500 Received: from mail-oi1-f174.google.com ([209.85.167.174]:43504 "EHLO mail-oi1-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233892AbhBBU4f (ORCPT ); Tue, 2 Feb 2021 15:56:35 -0500 Received: by mail-oi1-f174.google.com with SMTP id d20so8522257oiw.10; Tue, 02 Feb 2021 12:56:18 -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=TirDo8SCmisn1W/UErBbzPEcNL9EIsBI0Hpki5C3reAXYhoSyMvLH9cxTottf6sVxK xf/Jtyc9BJmX5T656HZ6pbppu0F7+Cl682xD1LEhWhOyi9yZ0DUoRwJ96KHcw8CCG2tC z2IoZZZvvU8DC/4XUKBbC5SA/yxyTbLTpApTQE2AlkFPI4DM6b+dEkZBT+RTzYZRsPCR UZk4i5iInD9oE06ZG8JyG8t++oZ/fr4ar46h3ZtGsortA3UNrRcdaL8unGU2FDBqKEG/ gn95tEvaLm8gG8JiayyY5UYcHIqWZM/VwtPZVOdSpSxVXxXuCuRkoK0pPPsmO+78Mb0N /vGg== X-Gm-Message-State: AOAM531v5X1td8BoFObr3WdUUyVxfBZJ8i14wlmi8ivhfbfEVjD8sS2l DD/Nk7DiI16rGCbsdeeq8vxsvi6uBg== X-Google-Smtp-Source: ABdhPJypjDN+Ts39JWA5K5FwFDZxnlgjEBltLJwzpuZeV8Gkh6PNkOJl8PkeKNKnT1CjwRFOWOyTZg== 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 Cc: linux-kernel@vger.kernel.org, Stephen Boyd , Maxime Ripard , Chen-Yu Tsai , Linus Walleij , Herbert Xu , "David S. Miller" , Daniel Palmer , Bartosz Golaszewski , Avi Fishman , Tomer Maimon , Tali Perry , Joerg Roedel , Will Deacon , Andrew Jeffery , Joel Stanley , Wim Van Sebroeck , Guenter Roeck , Yoshihiro Shimoda , Vincent Cheng , linux-clk@vger.kernel.org, linux-crypto@vger.kernel.org, linux-gpio@vger.kernel.org, linux-i2c@vger.kernel.org, iommu@lists.linux-foundation.org, linux-watchdog@vger.kernel.org, Eric Anholt , Nicolas Saenz Julienne , Florian Fainelli , Ray Jui , Scott Branden , Pavel Machek , Ulf Hansson , Kishon Vijay Abraham I , Vinod Koul , Geert Uytterhoeven , Daniel Lezcano , dri-devel@lists.freedesktop.org, linux-leds@vger.kernel.org, linux-mmc@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 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org 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 Acked-by: Maxime Ripard Acked-By: Vinod Koul Reviewed-by: Nicolas Saenz Julienne Acked-by: Geert Uytterhoeven --- .../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(-) 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: