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 X-Patchwork-Id: 499765 Delivered-To: patch@linaro.org Received: by 2002:a02:6f15:0:0:0:0:0 with SMTP id x21csp796888jab; Thu, 19 Aug 2021 11:42:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwyWq6mdsiRdZVzvvHyXIOYpJCjmBvUjYCVAI6jEKLiXZRHTLtX8QSKSp25oXe0euUGN5US X-Received: by 2002:a05:6e02:13e1:: with SMTP id w1mr11463390ilj.116.1629398563446; Thu, 19 Aug 2021 11:42:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629398563; cv=none; d=google.com; s=arc-20160816; b=fU1AXAUwo1MDDSA2JfBEbfCCeweBQrNoP0GQZuwv4l5fQ9JNNLvYD47jgQB1zIwX3Q Zi3oKytiU5gnvnlIMQ0zct3JvAj6WV3Woz8gDrj16YKvKkCG4a7NVbJzNaYHapkv8bMf dxC/r7KgELurBprJhwJLfGgMVDI3B4jaPOLqD8LF7OepA9fUsLcPKz84XuNQrB895nmZ Y++pQMHbuQ35Z3f0ZOSW9o/1ogKXLRY+Vk2B8eSXHad5YU/byfATFyNwHIXSKCPO5ga7 z+WqFs+IORZ9h7TJrWqiJAmctwls0MI8AfBE9eZV6LQJ4WMJ9fwHJY8YoZbKkM7pI1Lu 0VtQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=TZWKwStN6MATtB/XLi53g0TP+9a8Dyy8oUdRFDMDmo4=; b=Rl2atv3cKIQfBReWchka33vUnsiRiCqFqY/j3cmGL9GzFgLaF9BnxwVl+mDrMet3w/ e+g7fsTNbAJgwYQQSw/demyub2LyqNyq4ytCgjB1SP4mHciJIqEXM5IQsbtgvf1Dcbpk /zu0BC0u3rseOq90Ax4buVEJZxgIcisZw6UJONpJSHvjtHyZAlbYsamMzMhEUfUNgIpm QvXEncp322GPHlYjqD9mfeQmL5jxY8tw7U5I8QPeJDbAUqNH5EvWrBSO7q0yoPFABVSP nmBOSWVZzLPfDY59Nf7CQ0cjG70O1FxJQYgZjAiPttVwiYVFIRIkyA/SkJQ6zeI9VrJt ZZWg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-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 o4si3850795ilf.130.2021.08.19.11.42.43; Thu, 19 Aug 2021 11:42:43 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-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 devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-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 S233364AbhHSSnT (ORCPT + 7 others); 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-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(-) -- 2.30.2 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 X-Patchwork-Id: 499766 Delivered-To: patch@linaro.org Received: by 2002:a02:6f15:0:0:0:0:0 with SMTP id x21csp796922jab; Thu, 19 Aug 2021 11:42:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9yOCA8ZW31G6gYfPtd/dDjIICnTgIC78WBabO1Z/zZz8UKg8PTc0azaWI45OvWuyM9fsg X-Received: by 2002:a5d:824e:: with SMTP id n14mr12481771ioo.134.1629398566754; Thu, 19 Aug 2021 11:42:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629398566; cv=none; d=google.com; s=arc-20160816; b=BYbPMggED9lviIJRshVj7jUSjx90l6hsiWeyaz54wfqlMvdAWkxPrZWvuZcWsakz08 aJXGz49Dn4oOrQBFCgr+kc4OHzA3YXV1Tkr+AdfRY7pNvezihsNxHolyBE4xXZ8Ugh47 +tG9QMXbocVBf859dYCoeBhYn9LQh6I0iogTZf9aXtId1iIoPPBOky23eJ51HhrNNohT XIr3J3pRTNCNzndeuPwyysTKsNZ8TQ/a7A3c8LDT1udAjgPogQClijxQqWeLCKNmb1dz n4P0WAXSlsFgCIvZS0lifG6Kl9YnYXSooy6w0DGSKYSOW4DyWZwfATrj9aE69II2Yw74 Pu/g== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=zZgof1k2f+12nYrFzWi4JjoSLc6lNhG1HSxTD3Jvsxg=; b=D2Glm6HobtDYe8paoYxA5HvvvMMUQGcA8BI6c+K7hK4T52fV1/4FzKOOPecAWmqXxn USTsOW/qsuvChftN66DvGufUjuAVWDPbwi8VS35SegoYiV4XnyelL5jh6xb55q/67lQo hb5c+ndh8kmvVUnvDRyq6D37S4K64JSK2L+pTyxvrDgoM8vVD8wULtMyZfNvk1u3YFpq VGCI7p4QXVf16fzB6MxwUhv71vSpm17dT2VxXM7lBw0jYDIG8PkSDTMA0IDctvqoNojA m0wZ5G+BqUmrAyqrgPZCtiTW0SAoeHLni2Kg1UNgq5ZrSRc8JSxmjz8xsHdHRVnXotqr fZoA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-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 o4si3850795ilf.130.2021.08.19.11.42.46; Thu, 19 Aug 2021 11:42:46 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-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 devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-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 S234488AbhHSSnV (ORCPT + 7 others); 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-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(-) -- 2.30.2 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 From patchwork Thu Aug 19 18:42:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 499767 Delivered-To: patch@linaro.org Received: by 2002:a02:6f15:0:0:0:0:0 with SMTP id x21csp796933jab; Thu, 19 Aug 2021 11:42:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyRBYcv9Go/W01dvagsyCU1tk7W1Q/H59aUD9EPNaQKCad9p3CDwSDtGbuGe9LOt5zJZRn1 X-Received: by 2002:a05:6638:2712:: with SMTP id m18mr13994909jav.76.1629398567453; Thu, 19 Aug 2021 11:42:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629398567; cv=none; d=google.com; s=arc-20160816; b=oJjV8uJZ/w7qN7g4rE7VkJl/Qy4wTTp7/+MTeuQDCwSCEovgwaACx7Xfu6RCuHSzKB G75XfNJGxjvnLq7PRaT/JV3dZnpG9cZ2IgJM1jbZeuxacFexGYmLf2mtLFDmeVgs+Mi7 0Ym9mmYFzg/eQZoZJ9VYaQfS88nXE5lfRvy2YR/OKQudDx3Jbyc/DnzhKMLHDbBjdHKV e16yu07fjEMcjPjzjaU6q/nCEgMa4LthgNE6fRnBD/BpKKV+SaKcQqJdcto4FrKM5QvN UHFmJqXoCHB0FO3PcXQdFHThW2r09xUjUa3M9cWjsVBzj/hLIyz3boEcXfEkLhVkQTnb CMIg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=B8IQcMYn6Nt4vVkRQ2CEDfy3o3ulbCHKJd+0j5j6+4k=; b=b77fmqLlXsWEGdRESMgLp0QjEkMMlWhS6fvotxJdBxxkib9McHGgyN7PSysA2GcSiP Eu29mqUpuCuoXRsJoCTR7dEqCgpkCJcb+mI4kHTNN5bm/vv2rOCkKAM0HcPwqG5xqk0c m6oSxtOnkyb2pT/0CbAujE8ec0tqzW5w0Kugu7YM5fu10oexh81RJ0kCgo/C9SyKEJou b6dGfAi7IMa7S5khd54U8JiE2P+JvGmoDM93Ew/B3eDTTLy7eVC1DuGk5ST4z5PMw4uM KWvbyPj2fBMZbHezysBhsPerYuMg8Wg3Tr5xeA6blj7QfHI2FUbC6X1rhiefIo37XArJ hmyQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-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 o4si3850795ilf.130.2021.08.19.11.42.47; Thu, 19 Aug 2021 11:42:47 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-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 devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-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 S229451AbhHSSnW (ORCPT + 7 others); Thu, 19 Aug 2021 14:43:22 -0400 Received: from mail-ot1-f46.google.com ([209.85.210.46]:40500 "EHLO mail-ot1-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234477AbhHSSnV (ORCPT ); Thu, 19 Aug 2021 14:43:21 -0400 Received: by mail-ot1-f46.google.com with SMTP id h63-20020a9d14450000b02904ce97efee36so9874610oth.7 for ; Thu, 19 Aug 2021 11:42:44 -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=B8IQcMYn6Nt4vVkRQ2CEDfy3o3ulbCHKJd+0j5j6+4k=; b=hV6GYiEhhMIflwt7y8g4h3EuyviI8F7aQXwiJBK1+rq0erVNbnDgImc7RC1PTvYupN nYSp95OBL0NbAzbHi0cBGzAXH4kbpNx/nRqENvU7ov0bhtHhlZ4xhyN9eCkad+M5DFJr T8rC2ER67uy47rD5/q2QlT4Z1oPXHIyVh16hJSTb4ANUhy3KndwLMwOfF5Tn2gFzKIze jyirgKfgT4Jt+H2vDOQS7GHbYYSdcMQHWwAweqZVROCfvbxSNN8GGWn39SxqDqmF22ld zZ5xRmnRhbeuL4OElmGXpQwdWP0gedgki7JUJqUKG11XYX8B7dJ3XWq+7n+1lNS63NkY Y67w== X-Gm-Message-State: AOAM533ORZ0Kd1yfQ8K1oHuca4ZBnDzDrD36y4KaENcgtN88/5oaK4qX /MfcE0gqppzsFtiqbA5dgA== X-Received: by 2002:a05:6830:544:: with SMTP id l4mr13312445otb.164.1629398564604; Thu, 19 Aug 2021 11:42:44 -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.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Aug 2021 11:42:44 -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 3/5] arm: dts: vexpress: Drop unused properties from motherboard node Date: Thu, 19 Aug 2021 13:42:37 -0500 Message-Id: <20210819184239.1192395-4-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 Drop the '#interrupt-cells' property in the motherboard node which has no effect as the node is neither an interrupt-controller or interrupt-map (that's in the parent node). Drop 'model' as it is not used by software nor documented. Drop 'arm,v2m-memory-map' as it is not used by software. The purpose was to describe which memory map, but that's all described by the DT already. Cc: Andre Przywara Cc: Sudeep Holla Cc: Linus Walleij Signed-off-by: Rob Herring --- arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 3 --- arch/arm/boot/dts/vexpress-v2m.dtsi | 2 -- arch/arm64/boot/dts/arm/foundation-v8.dtsi | 1 - arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 3 --- arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 2 -- 5 files changed, 11 deletions(-) -- 2.30.2 diff --git a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi index 2ad9fd7c94ec..f61251b3c74f 100644 --- a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi +++ b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi @@ -102,14 +102,11 @@ led-8 { bus@8000000 { motherboard-bus { - model = "V2M-P1"; arm,hbi = <0x190>; arm,vexpress,site = <0>; - arm,v2m-memory-map = "rs1"; compatible = "arm,vexpress,v2m-p1", "simple-bus"; #address-cells = <2>; /* SMB chipselect number and offset */ #size-cells = <1>; - #interrupt-cells = <1>; ranges; nor_flash: flash@0 { diff --git a/arch/arm/boot/dts/vexpress-v2m.dtsi b/arch/arm/boot/dts/vexpress-v2m.dtsi index ec13ceb9ed36..fb8ca984ce1f 100644 --- a/arch/arm/boot/dts/vexpress-v2m.dtsi +++ b/arch/arm/boot/dts/vexpress-v2m.dtsi @@ -21,13 +21,11 @@ / { bus@4000000 { motherboard { - model = "V2M-P1"; arm,hbi = <0x190>; arm,vexpress,site = <0>; compatible = "arm,vexpress,v2m-p1", "simple-bus"; #address-cells = <2>; /* SMB chipselect number and offset */ #size-cells = <1>; - #interrupt-cells = <1>; ranges; flash@0,00000000 { diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi index 05ae893d1b2e..fbf13f7c2baf 100644 --- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi +++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi @@ -115,7 +115,6 @@ v2m_refclk32khz: refclk32khz { bus@8000000 { compatible = "arm,vexpress,v2m-p1", "simple-bus"; - arm,v2m-memory-map = "rs1"; #address-cells = <2>; /* SMB chipselect number and offset */ #size-cells = <1>; diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi index 40d95c58b55e..4203f0a6ddf6 100644 --- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi +++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi @@ -96,12 +96,9 @@ motherboard-bus { compatible = "arm,vexpress,v2p-p1", "simple-bus"; #address-cells = <2>; /* SMB chipselect number and offset */ #size-cells = <1>; - #interrupt-cells = <1>; ranges; - model = "V2M-Juno"; arm,hbi = <0x252>; arm,vexpress,site = <0>; - arm,v2m-memory-map = "rs1"; flash@0 { /* 2 * 32MiB NOR Flash memory mounted on CS0 */ diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi index 4c4a381d2c75..0459aff22f27 100644 --- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi +++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi @@ -78,11 +78,9 @@ dvimode { bus@8000000 { motherboard-bus { - arm,v2m-memory-map = "rs1"; compatible = "arm,vexpress,v2m-p1", "simple-bus"; #address-cells = <2>; /* SMB chipselect number and offset */ #size-cells = <1>; - #interrupt-cells = <1>; ranges; flash@0 { From patchwork Thu Aug 19 18:42:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 499768 Delivered-To: patch@linaro.org Received: by 2002:a02:6f15:0:0:0:0:0 with SMTP id x21csp796939jab; Thu, 19 Aug 2021 11:42:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCZ3E3jfOfUUknhiqeUfql6kiEmmIU+KLRIIsibAmqyF8HPOJs0jidkJySGMLC242w/vLY X-Received: by 2002:a5d:9c89:: with SMTP id p9mr4850094iop.13.1629398567859; Thu, 19 Aug 2021 11:42:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629398567; cv=none; d=google.com; s=arc-20160816; b=yumeJZoLtOlbC3mj50hun5tJnXus8cOrah1uqNVimpfTheLocth0k0E+k6664ORFy8 /+HtUwy9ZgSJobtuxry8wB6i3vaDlSFMx+gybsAqa+LUwaA/NhONVhcflwG4Spn5CyDy buIfDFaqVOXwAlcTMqG+eu8fwYcjDGFvPGaI55CkV012rHrWbJoyfK/277T8h//HZSQJ rTNoHvU+G6ok0LxKyiDLW/ox/f4qpTOP0AqgzhDL5s3uCxDfb09cq4ai5a/lJKrdKQAK cpdR4uBlSJNsRQVQo5xb2MAR4duyfVV8Rq1bk2GFAuQkhdqe7rcWc32gsQqA36oS/vn/ kIHw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=PL9Youq2DWomnSHhW7sKKKK7RXeFafVFmBnDw8i/OAs=; b=Sm8BGuP1sieCwls0Hl52BUN57RSWmcld98m41GGdahw5MY1BHrylqVjCUPctgv27pe L21i+CmBh1J7CcpL7pHL6mygbNjBGYNh1X2Y+8FdO/OMpHwZM3d6XIw/IdJTc+786u/G LNruk/55RJBttlYp8sZTCETCAnFQXG6U7tbIOnSSIVDR/xWUS/DlEUjeOFHHhbdToZmq 0mN8u+QrGcRv4eJZnbaz6pycrhkClew+pjoLTZvlgNUDD3T9TgUrpIP4qx1G/fexVjTB wuaZwlJn0b5GftCskO6eHsuzJRGRr0oewHiefRXbfUhnFzH8YCGtPTpjkB3UmfYGxaQD +wmQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-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 o4si3850795ilf.130.2021.08.19.11.42.47; Thu, 19 Aug 2021 11:42:47 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-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 devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-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 S234317AbhHSSnX (ORCPT + 7 others); Thu, 19 Aug 2021 14:43:23 -0400 Received: from mail-oi1-f172.google.com ([209.85.167.172]:36352 "EHLO mail-oi1-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234528AbhHSSnW (ORCPT ); Thu, 19 Aug 2021 14:43:22 -0400 Received: by mail-oi1-f172.google.com with SMTP id bd1so9782864oib.3 for ; Thu, 19 Aug 2021 11:42:46 -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=PL9Youq2DWomnSHhW7sKKKK7RXeFafVFmBnDw8i/OAs=; b=IJuMuzEbh2VgZO4TL3KGckQq/YrhuKGUW/P4TsNriFnq+fWRoMq7Slc8cDdWZCxUbp LHy+dQyYlFw6xekQsgK8Vq/HU6QYEl6BGd5Viff+lJf4D/EJBvVVxJ/H+uCPKQV195/f 9RY3K57li90ulHttfjBQUKUcJ1whF+Azkt1+P5bZDlzpqxOWpBIzIViIhXF2IAeeeHds TTzRmRqr5z9ruehJkoPf/sCuHl5DeTsRm+VfTGyfitAy3ek/iuuAHCVvHpuTTPhO2GEr dPdV8HiOkgT88qd9jYZzN+ciAq/Ds33UBqFuZsJwn54hO1JYnLXCjV54hg97gYvk7BjO zDiw== X-Gm-Message-State: AOAM532HAtr+90ykljwM3Nc59/Zy8cxRoVP9486I4vQQ5GrsboxNOwD3 MEY+njPTF1bGSXOeGjqHzA== X-Received: by 2002:aca:dfc5:: with SMTP id w188mr100719oig.51.1629398565768; Thu, 19 Aug 2021 11:42:45 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Aug 2021 11:42:45 -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 4/5] arm: dts: vexpress-v2p-ca9: Fix the SMB unit-address Date: Thu, 19 Aug 2021 13:42:38 -0500 Message-Id: <20210819184239.1192395-5-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 Based on 'ranges', the 'bus@4000000' node unit-address is off by 1 '0'. Cc: Andre Przywara Cc: Sudeep Holla Cc: Linus Walleij Signed-off-by: Rob Herring --- arch/arm/boot/dts/vexpress-v2m.dtsi | 2 +- arch/arm/boot/dts/vexpress-v2p-ca9.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.30.2 diff --git a/arch/arm/boot/dts/vexpress-v2m.dtsi b/arch/arm/boot/dts/vexpress-v2m.dtsi index fb8ca984ce1f..0819d112de12 100644 --- a/arch/arm/boot/dts/vexpress-v2m.dtsi +++ b/arch/arm/boot/dts/vexpress-v2m.dtsi @@ -19,7 +19,7 @@ */ / { - bus@4000000 { + bus@40000000 { motherboard { arm,hbi = <0x190>; arm,vexpress,site = <0>; diff --git a/arch/arm/boot/dts/vexpress-v2p-ca9.dts b/arch/arm/boot/dts/vexpress-v2p-ca9.dts index 4c5847955856..1317f0f58d53 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca9.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca9.dts @@ -295,7 +295,7 @@ power-vd10-s3 { }; }; - smb: bus@4000000 { + smb: bus@40000000 { compatible = "simple-bus"; #address-cells = <2>; From patchwork Thu Aug 19 18:42:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 499769 Delivered-To: patch@linaro.org Received: by 2002:a02:6f15:0:0:0:0:0 with SMTP id x21csp796951jab; Thu, 19 Aug 2021 11:42:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzv1oagDNhqwxnj7pEwkZqs4JS0I+M8Kv7p5BhQhWxLPX30TewRmShNeEZfRtvH3KS4NfnJ X-Received: by 2002:a92:d10d:: with SMTP id a13mr11166905ilb.87.1629398568750; Thu, 19 Aug 2021 11:42:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629398568; cv=none; d=google.com; s=arc-20160816; b=G5GTKB8rtEnDP6rE61xATFlMiUdmIL4KlgUjaciK7up9Is7haKoz3xY+hYlG5r6Pve tGLLZCp+gMboFngzNV4ZNsHtbumgZfAJMLDoJcrM1dgFekjnvHajQxEaMw4gH2bsx8GW Z5DGaOwDWWLP9rCizaH1FIif1rh+ACZqg+hQy4rYeu+O9ZKesUsyio5nznmHEyP/R4/S FMBAyj8gNUWHTNYFinavFy5cgH9nZAAz+hZXVrj6wekI+4ATe3bQEsmG/YrBAFrBZRjE MwnRzZryzFwcoI/4Rk46uREUNv5MNuwFBCoUyqEQlxTv8qwQbfbgt1ec0OmVU9lBNIGk bGmA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=WBxIT2XP4cvild9L2wVS8GZQLbMG6OtFcJU7VciJNiw=; b=Cj1MXCD2UwrwWn7ZV+08JX1OILXUErGB91RSRrozv+HbSf9BNF+JqD7VeJT5uznp7m qGiEYHkmveLiH+jPJvP+tiB5MXA79V5cJUIQLS0WkPWpxfp0lbVIjX3jf0IIELnpm1Tf rKNiL7F0M3q10YO3HTQhNFNUfHo7pZ4UZIF5tDce0/tW+LxxiXq18m44695iQNsdSlEI EKXKd9YArM8PVJFqQyHczPuy9+OJRl8pNWfX1EIAAY56Mxez2DRowVnynjCDeRyQYJTT 0WRqMqiLb8be8PYFJqSLUJo4uxudKHXy71jhd6n9toxEASPkW8RL8gU8OUnNI89geaaI YX6g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-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 o4si3850795ilf.130.2021.08.19.11.42.48; Thu, 19 Aug 2021 11:42:48 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-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 devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-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 S234422AbhHSSnY (ORCPT + 7 others); Thu, 19 Aug 2021 14:43:24 -0400 Received: from mail-ot1-f51.google.com ([209.85.210.51]:41473 "EHLO mail-ot1-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234365AbhHSSnY (ORCPT ); Thu, 19 Aug 2021 14:43:24 -0400 Received: by mail-ot1-f51.google.com with SMTP id w22-20020a056830411600b0048bcf4c6bd9so9893275ott.8 for ; Thu, 19 Aug 2021 11:42:47 -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=WBxIT2XP4cvild9L2wVS8GZQLbMG6OtFcJU7VciJNiw=; b=K+gQvrHAMLKzZFJ44DArqEpR+bWQFg5rNZ0cJEaoeWGW28cMe4dZsCZ4vcEdx4q+VS +cC6tXMriGX+qyOO8Q1BUkikQdhkwusQjIb6yRfMQwveBdMZn6s9heyiV5p87GMQl8eB zVS1xSVVHpZKKhadEczGV4VgMhUFy2TLJvMvkpzKd97tFDCSCXcJjcbB74KksZYW76js Ieyyt+bWIXi+8f16Os+q07T0HNY9ehiTFZnQeGxfFX3F35kTRf0sC73//SlYpTYgZjMF P2XahTWOn888BEj/IM+ml9Sm+fKepR05mhNIm8o4LbjISxqL+JBnJ9PCU3U4jf+HczT0 Jr0A== X-Gm-Message-State: AOAM531sBjqGfgPnZkoYSPWkdmymdWnFk/VjZjjWf3CYjsGifmBXK4xV ZsoSp/i9P5Q4kjnnCGr6cw== X-Received: by 2002:a9d:7044:: with SMTP id x4mr12977429otj.326.1629398567151; Thu, 19 Aug 2021 11:42:47 -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.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Aug 2021 11:42:46 -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 5/5] arm: dts: vexpress: Fix addressing issues with 'motherboard-bus' nodes Date: Thu, 19 Aug 2021 13:42:39 -0500 Message-Id: <20210819184239.1192395-6-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 'motherboard-bus' node in Arm Ltd boards fails schema checks as 'simple-bus' child nodes must have a unit-address. The 'ranges' handling is also wrong (or at least strange) as the mapping of SMC chip selects should be in the 'arm,vexpress,v2m-p1' node rather than a generic 'simple-bus' node. Either there's 1 too many levels of 'simple-bus' nodes or 'ranges' should be moved down a level. The latter change is more simple, so let's do that. As the 'ranges' value doesn't vary for a given motherboard instance, we can move 'ranges' into the motherboard dtsi files. Cc: Andre Przywara Cc: Sudeep Holla Cc: Linus Walleij Signed-off-by: Rob Herring --- arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 14 ++++++++++++-- arch/arm/boot/dts/vexpress-v2m.dtsi | 14 ++++++++++++-- arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 11 ----------- arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 11 ----------- arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 11 ----------- arch/arm/boot/dts/vexpress-v2p-ca9.dts | 10 ---------- arch/arm64/boot/dts/arm/fvp-base-revc.dts | 11 ----------- arch/arm64/boot/dts/arm/juno-base.dtsi | 10 ---------- arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 14 ++++++++++++-- arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 11 ----------- .../boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi | 2 +- arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 14 ++++++++++++-- .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 11 ----------- 13 files changed, 49 insertions(+), 95 deletions(-) -- 2.30.2 diff --git a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi index f61251b3c74f..19b300532b37 100644 --- a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi +++ b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi @@ -101,13 +101,23 @@ led-8 { }; bus@8000000 { - motherboard-bus { + compatible = "simple-bus"; + #address-cells = <2>; + #size-cells = <1>; + ranges = <0 0x8000000 0 0x8000000 0x18000000>; + + motherboard-bus@8000000 { arm,hbi = <0x190>; arm,vexpress,site = <0>; compatible = "arm,vexpress,v2m-p1", "simple-bus"; #address-cells = <2>; /* SMB chipselect number and offset */ #size-cells = <1>; - ranges; + ranges = <0 0 0 0x08000000 0x04000000>, + <1 0 0 0x14000000 0x04000000>, + <2 0 0 0x18000000 0x04000000>, + <3 0 0 0x1c000000 0x04000000>, + <4 0 0 0x0c000000 0x04000000>, + <5 0 0 0x10000000 0x04000000>; nor_flash: flash@0 { compatible = "arm,vexpress-flash", "cfi-flash"; diff --git a/arch/arm/boot/dts/vexpress-v2m.dtsi b/arch/arm/boot/dts/vexpress-v2m.dtsi index 0819d112de12..0547f633764f 100644 --- a/arch/arm/boot/dts/vexpress-v2m.dtsi +++ b/arch/arm/boot/dts/vexpress-v2m.dtsi @@ -20,13 +20,23 @@ / { bus@40000000 { - motherboard { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x40000000 0x40000000 0x10000000>, + <0x10000000 0x10000000 0x00020000>; + + motherboard-bus@40000000 { arm,hbi = <0x190>; arm,vexpress,site = <0>; compatible = "arm,vexpress,v2m-p1", "simple-bus"; #address-cells = <2>; /* SMB chipselect number and offset */ #size-cells = <1>; - ranges; + ranges = <0 0 0x40000000 0x04000000>, + <1 0 0x44000000 0x04000000>, + <2 0 0x48000000 0x04000000>, + <3 0 0x4c000000 0x04000000>, + <7 0 0x10000000 0x00020000>; flash@0,00000000 { compatible = "arm,vexpress-flash", "cfi-flash"; diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts index e63c5c0bfb43..26b6862e519f 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts @@ -237,17 +237,6 @@ energy { }; bus@8000000 { - compatible = "simple-bus"; - - #address-cells = <2>; - #size-cells = <1>; - ranges = <0 0 0 0x08000000 0x04000000>, - <1 0 0 0x14000000 0x04000000>, - <2 0 0 0x18000000 0x04000000>, - <3 0 0 0x1c000000 0x04000000>, - <4 0 0 0x0c000000 0x04000000>, - <5 0 0 0x10000000 0x04000000>; - #interrupt-cells = <1>; interrupt-map-mask = <0 0 63>; interrupt-map = <0 0 0 &gic 0 0 4>, diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts index 012d40a7228c..5ec25eebbd77 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts @@ -609,17 +609,6 @@ etm2_out_port: endpoint { }; smb: bus@8000000 { - compatible = "simple-bus"; - - #address-cells = <2>; - #size-cells = <1>; - ranges = <0 0 0 0x08000000 0x04000000>, - <1 0 0 0x14000000 0x04000000>, - <2 0 0 0x18000000 0x04000000>, - <3 0 0 0x1c000000 0x04000000>, - <4 0 0 0x0c000000 0x04000000>, - <5 0 0 0x10000000 0x04000000>; - #interrupt-cells = <1>; interrupt-map-mask = <0 0 63>; interrupt-map = <0 0 0 &gic 0 0 4>, diff --git a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts index 7aa64ae25779..f1485ee3ce83 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts @@ -207,17 +207,6 @@ temp-dcc { }; smb: bus@8000000 { - compatible = "simple-bus"; - - #address-cells = <2>; - #size-cells = <1>; - ranges = <0 0 0x08000000 0x04000000>, - <1 0 0x14000000 0x04000000>, - <2 0 0x18000000 0x04000000>, - <3 0 0x1c000000 0x04000000>, - <4 0 0x0c000000 0x04000000>, - <5 0 0x10000000 0x04000000>; - #interrupt-cells = <1>; interrupt-map-mask = <0 0 63>; interrupt-map = <0 0 0 &gic 0 0 4>, diff --git a/arch/arm/boot/dts/vexpress-v2p-ca9.dts b/arch/arm/boot/dts/vexpress-v2p-ca9.dts index 1317f0f58d53..99b2f339cc04 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca9.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca9.dts @@ -296,16 +296,6 @@ power-vd10-s3 { }; smb: bus@40000000 { - compatible = "simple-bus"; - - #address-cells = <2>; - #size-cells = <1>; - ranges = <0 0 0x40000000 0x04000000>, - <1 0 0x44000000 0x04000000>, - <2 0 0x48000000 0x04000000>, - <3 0 0x4c000000 0x04000000>, - <7 0 0x10000000 0x00020000>; - #interrupt-cells = <1>; interrupt-map-mask = <0 0 63>; interrupt-map = <0 0 0 &gic 0 0 4>, diff --git a/arch/arm64/boot/dts/arm/fvp-base-revc.dts b/arch/arm64/boot/dts/arm/fvp-base-revc.dts index b8a21092db4d..5f519affe728 100644 --- a/arch/arm64/boot/dts/arm/fvp-base-revc.dts +++ b/arch/arm64/boot/dts/arm/fvp-base-revc.dts @@ -207,17 +207,6 @@ panel-timing { }; bus@8000000 { - compatible = "simple-bus"; - - #address-cells = <2>; - #size-cells = <1>; - ranges = <0 0 0 0x08000000 0x04000000>, - <1 0 0 0x14000000 0x04000000>, - <2 0 0 0x18000000 0x04000000>, - <3 0 0 0x1c000000 0x04000000>, - <4 0 0 0x0c000000 0x04000000>, - <5 0 0 0x10000000 0x04000000>; - #interrupt-cells = <1>; interrupt-map-mask = <0 0 63>; interrupt-map = <0 0 0 &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>, diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi index 8e7a66943b01..fd1e9708bdaf 100644 --- a/arch/arm64/boot/dts/arm/juno-base.dtsi +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi @@ -804,16 +804,6 @@ memory@80000000 { }; bus@8000000 { - compatible = "simple-bus"; - #address-cells = <2>; - #size-cells = <1>; - ranges = <0 0 0 0x08000000 0x04000000>, - <1 0 0 0x14000000 0x04000000>, - <2 0 0 0x18000000 0x04000000>, - <3 0 0 0x1c000000 0x04000000>, - <4 0 0 0x0c000000 0x04000000>, - <5 0 0 0x10000000 0x04000000>; - #interrupt-cells = <1>; interrupt-map-mask = <0 0 15>; interrupt-map = <0 0 0 &gic 0 GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>, diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi index 4203f0a6ddf6..1578ffb07e03 100644 --- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi +++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi @@ -92,11 +92,21 @@ nmi-button { }; bus@8000000 { - motherboard-bus { + compatible = "simple-bus"; + #address-cells = <2>; + #size-cells = <1>; + ranges = <0 0x8000000 0 0x8000000 0x18000000>; + + motherboard-bus@8000000 { compatible = "arm,vexpress,v2p-p1", "simple-bus"; #address-cells = <2>; /* SMB chipselect number and offset */ #size-cells = <1>; - ranges; + ranges = <0 0 0 0x08000000 0x04000000>, + <1 0 0 0x14000000 0x04000000>, + <2 0 0 0x18000000 0x04000000>, + <3 0 0 0x1c000000 0x04000000>, + <4 0 0 0x0c000000 0x04000000>, + <5 0 0 0x10000000 0x04000000>; arm,hbi = <0x252>; arm,vexpress,site = <0>; diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts index 3050f45bade4..258991ad7cc0 100644 --- a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts +++ b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts @@ -133,17 +133,6 @@ panel_in: endpoint { }; bus@8000000 { - compatible = "simple-bus"; - - #address-cells = <2>; - #size-cells = <1>; - ranges = <0 0 0 0x08000000 0x04000000>, - <1 0 0 0x14000000 0x04000000>, - <2 0 0 0x18000000 0x04000000>, - <3 0 0 0x1c000000 0x04000000>, - <4 0 0 0x0c000000 0x04000000>, - <5 0 0 0x10000000 0x04000000>; - #interrupt-cells = <1>; interrupt-map-mask = <0 0 63>; interrupt-map = <0 0 0 &gic GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>, diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi index b917d9d3f1c4..33182d9e5826 100644 --- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi +++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi @@ -6,7 +6,7 @@ */ / { bus@8000000 { - motherboard-bus { + motherboard-bus@8000000 { arm,v2m-memory-map = "rs2"; iofpga-bus@300000000 { diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi index 0459aff22f27..a13e71ed524a 100644 --- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi +++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi @@ -77,11 +77,21 @@ dvimode { }; bus@8000000 { - motherboard-bus { + compatible = "simple-bus"; + #address-cells = <2>; + #size-cells = <1>; + ranges = <0 0x8000000 0 0x8000000 0x18000000>; + + motherboard-bus@8000000 { compatible = "arm,vexpress,v2m-p1", "simple-bus"; #address-cells = <2>; /* SMB chipselect number and offset */ #size-cells = <1>; - ranges; + ranges = <0 0 0 0x08000000 0x04000000>, + <1 0 0 0x14000000 0x04000000>, + <2 0 0 0x18000000 0x04000000>, + <3 0 0 0x1c000000 0x04000000>, + <4 0 0 0x0c000000 0x04000000>, + <5 0 0 0x10000000 0x04000000>; flash@0 { compatible = "arm,vexpress-flash", "cfi-flash"; diff --git a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts index d859914500a7..6958469bceaa 100644 --- a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts +++ b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts @@ -145,17 +145,6 @@ temp-fpga { }; smb: bus@8000000 { - compatible = "simple-bus"; - - #address-cells = <2>; - #size-cells = <1>; - ranges = <0 0 0 0x08000000 0x04000000>, - <1 0 0 0x14000000 0x04000000>, - <2 0 0 0x18000000 0x04000000>, - <3 0 0 0x1c000000 0x04000000>, - <4 0 0 0x0c000000 0x04000000>, - <5 0 0 0x10000000 0x04000000>; - #interrupt-cells = <1>; interrupt-map-mask = <0 0 63>; interrupt-map = <0 0 0 &gic GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,