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 \(Arm\)" X-Patchwork-Id: 374716 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, URIBL_BLOCKED, 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 4BF6FC433E0 for ; Tue, 2 Feb 2021 20:57:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 08C9A64F63 for ; Tue, 2 Feb 2021 20:57:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233942AbhBBU4e (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-crypto@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 --- .../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