From patchwork Thu Aug 19 18:42:35 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: 1518797 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@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=devicetree-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4GrDCl4TKCz9sWl for ; Fri, 20 Aug 2021 04:42:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233364AbhHSSnT (ORCPT ); Thu, 19 Aug 2021 14:43:19 -0400 Received: from mail-ot1-f43.google.com ([209.85.210.43]:33537 "EHLO mail-ot1-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229451AbhHSSnS (ORCPT ); Thu, 19 Aug 2021 14:43:18 -0400 Received: by mail-ot1-f43.google.com with SMTP id 61-20020a9d0d430000b02903eabfc221a9so9971962oti.0 for ; Thu, 19 Aug 2021 11:42:42 -0700 (PDT) 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=TZWKwStN6MATtB/XLi53g0TP+9a8Dyy8oUdRFDMDmo4=; b=PSHR53QYsCrDVF2nl/Y3h3YYE+MpTA9VPTfor5NiUuWKxDv3OjPrzZxOY41QisH4N1 4AqRkwCvXuKIAQosH1g2TF4HThhlJabWQymp/TfSzQG8chC57QX5MCigJ8YncUQ2Q2a6 aYRet8dtT6zXPHkU8Y9kgGngIgo3qwikqHxdvbb29nwm9HRZVkggfwXveWylThFDzUC+ xL69FRtdddsgx9XRvII2XqyTOwSqdQejHbj7/rJpNUAb3GMM5Hjl1GEr1mLdaPzm1+0r deC0IXpkpUBLj6cb6JAlcOBwr4tBSY1Zv4SrUn5c2rG40eg0nXCBN8K2hEb2OGrpHOux ij0w== X-Gm-Message-State: AOAM531MPiDerFmMfOzCoMm/k+3ySKlrFOEd6FmFwbjPgHmCnZ7NmD5d 71I80ui24hWpIfa454W5FA== X-Google-Smtp-Source: ABdhPJyzJxJXBQmPLuzTOEurKWojo7fyc1PMzZDD2OVWbc/4PeL/pdbkZOeQAiTR43O+O+UFLPO+Fg== X-Received: by 2002:a05:6830:44a8:: with SMTP id r40mr13162082otv.222.1629398562017; Thu, 19 Aug 2021 11:42:42 -0700 (PDT) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id v19sm796485oic.31.2021.08.19.11.42.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Aug 2021 11:42:41 -0700 (PDT) From: Rob Herring To: Andre Przywara , Sudeep Holla , Linus Walleij Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/5] dt-bindings: arm,vexpress-juno: Fix 'motherboard' node name Date: Thu, 19 Aug 2021 13:42:35 -0500 Message-Id: <20210819184239.1192395-2-robh@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210819184239.1192395-1-robh@kernel.org> References: <20210819184239.1192395-1-robh@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Commit 9d0a36ddcc52 ("arm64: dts: fvp/juno: Fix bus node names") changed 'motherboard' to 'motherboard-bus', but didn't update the schema. In the mean time, the simple-bus schema started requiring child nodes to have a unit-address. Update the schema to address both of these issues. Cc: Andre Przywara Cc: Sudeep Holla Cc: Linus Walleij Signed-off-by: Rob Herring --- .../devicetree/bindings/arm/arm,vexpress-juno.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/arm,vexpress-juno.yaml b/Documentation/devicetree/bindings/arm/arm,vexpress-juno.yaml index 55ef656d1192..530a808e518a 100644 --- a/Documentation/devicetree/bindings/arm/arm,vexpress-juno.yaml +++ b/Documentation/devicetree/bindings/arm/arm,vexpress-juno.yaml @@ -154,9 +154,9 @@ patternProperties: description: Static Memory Bus (SMB) node, if this exists it describes the connection between the motherboard and any tiles. Sometimes the compatible is placed directly under this node, sometimes it is placed - in a subnode named "motherboard". Sometimes the compatible includes + in a subnode named "motherboard-bus". Sometimes the compatible includes "arm,vexpress,v2?-p1" sometimes (on software models) is is just - "simple-bus". If the compatible is placed in the "motherboard" node, + "simple-bus". If the compatible is placed in the "motherboard-bus" node, it is stricter and always has two compatibles. type: object $ref: '/schemas/simple-bus.yaml' @@ -170,7 +170,9 @@ patternProperties: - arm,vexpress,v2p-p1 - const: simple-bus - const: simple-bus - motherboard: + + patternProperties: + '^motherboard-bus@': type: object description: The motherboard description provides a single "motherboard" node using 2 address cells corresponding to the Static Memory Bus From patchwork Thu Aug 19 18:42:36 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: 1518799 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@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=devicetree-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4GrDCp4CV9z9sW5 for ; Fri, 20 Aug 2021 04:42:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234488AbhHSSnV (ORCPT ); Thu, 19 Aug 2021 14:43:21 -0400 Received: from mail-ot1-f42.google.com ([209.85.210.42]:45708 "EHLO mail-ot1-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229451AbhHSSnU (ORCPT ); Thu, 19 Aug 2021 14:43:20 -0400 Received: by mail-ot1-f42.google.com with SMTP id r17-20020a0568302371b0290504f3f418fbso9846191oth.12 for ; Thu, 19 Aug 2021 11:42:43 -0700 (PDT) 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=zZgof1k2f+12nYrFzWi4JjoSLc6lNhG1HSxTD3Jvsxg=; b=s511ITkcQwhyIXbgXkc41qcF2EWZJaEA0aY6igpoZ82NoxKw33q77ruIApzFUVr+IO SfOldjl8T1+/AHk6c9uzeczjXUK+c29iz41kySD0Xbezl+eKrqo0kbM4pId8u4BHAg7u +Y6cDnQ/J14VLelGvfFXHTDezdyuGHWH7RBlqrKV4S2p8W+PCmFryEm7cQqUhuCt57+2 u3xhC0jeAuBNZCmReAkS2X5Qq6QFqS/2vODz9Gx3Ai8Q14aQ95jBUxKvr9kqg/6jZaIl 72+SEdTvbbudHjpheg0LTEhpMLijGBoY+LWwFdQEvMwkogTNWR6B7asxU9j3YYK9abSK FZfA== X-Gm-Message-State: AOAM531M0+hGW4foGAMGMEfkYTLj5Pzct7g+o9a2lYaQ59x2o8786iws Q8hqeMhcrpRdi30sanoIhA== X-Google-Smtp-Source: ABdhPJwC+75A1szBze1M8/sxLG7jceMBgBVboctzuXRaf2MVoKiDgLnomZhMdXF+WoVzEnRf7hJslw== X-Received: by 2002:a9d:1991:: with SMTP id k17mr13290896otk.104.1629398563545; Thu, 19 Aug 2021 11:42:43 -0700 (PDT) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id v19sm796485oic.31.2021.08.19.11.42.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Aug 2021 11:42:42 -0700 (PDT) From: Rob Herring To: Andre Przywara , Sudeep Holla , Linus Walleij Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/5] dt-bindings: arm,vexpress-juno: Add missing motherboard properties Date: Thu, 19 Aug 2021 13:42:36 -0500 Message-Id: <20210819184239.1192395-3-robh@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210819184239.1192395-1-robh@kernel.org> References: <20210819184239.1192395-1-robh@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The arm,vexpress-juno binding is missing 'ranges', 'arm,vexpress,site', and 'arm,hbi' properties. Add these and and restrict additional properties to be nodes only. Cc: Andre Przywara Cc: Sudeep Holla Cc: Linus Walleij Signed-off-by: Rob Herring --- .../bindings/arm/arm,vexpress-juno.yaml | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/arm,vexpress-juno.yaml b/Documentation/devicetree/bindings/arm/arm,vexpress-juno.yaml index 530a808e518a..a4b4452afc1d 100644 --- a/Documentation/devicetree/bindings/arm/arm,vexpress-juno.yaml +++ b/Documentation/devicetree/bindings/arm/arm,vexpress-juno.yaml @@ -119,22 +119,6 @@ properties: - const: arm,foundation-aarch64 - const: arm,vexpress - arm,hbi: - $ref: '/schemas/types.yaml#/definitions/uint32' - description: This indicates the ARM HBI (Hardware Board ID), this is - ARM's unique board model ID, visible on the PCB's silkscreen. - - arm,vexpress,site: - description: As Versatile Express can be configured in number of physically - different setups, the device tree should describe platform topology. - For this reason the root node and main motherboard node must define this - property, describing the physical location of the children nodes. - 0 means motherboard site, while 1 and 2 are daughterboard sites, and - 0xf means "sisterboard" which is the site containing the main CPU tile. - $ref: '/schemas/types.yaml#/definitions/uint32' - minimum: 0 - maximum: 15 - arm,vexpress,position: description: When daughterboards are stacked on one site, their position in the stack be be described this attribute. @@ -185,6 +169,8 @@ patternProperties: const: 2 "#size-cells": const: 1 + ranges: true + compatible: items: - enum: @@ -198,8 +184,28 @@ patternProperties: - rs1 - rs2 + arm,hbi: + $ref: '/schemas/types.yaml#/definitions/uint32' + description: This indicates the ARM HBI (Hardware Board ID), this is + ARM's unique board model ID, visible on the PCB's silkscreen. + + arm,vexpress,site: + description: As Versatile Express can be configured in number of physically + different setups, the device tree should describe platform topology. + For this reason the root node and main motherboard node must define this + property, describing the physical location of the children nodes. + 0 means motherboard site, while 1 and 2 are daughterboard sites, and + 0xf means "sisterboard" which is the site containing the main CPU tile. + $ref: '/schemas/types.yaml#/definitions/uint32' + minimum: 0 + maximum: 15 + required: - compatible + + additionalProperties: + type: object + required: - compatible