Thread (9 messages) flat view 9 messages, 3 authors, 2021-09-16
STALE1794d LANDED

Landed in mainline as 1b4e3ca2dcc2 on 2021-09-20.

[PATCH 1/5] dt-bindings: arm, vexpress-juno: Fix 'motherboard' node name

From: Rob Herring <robh@kernel.org>
Date: 2021-08-19 18:42:43
Also in: linux-devicetree
Subsystem: arm integrator, versatile and realview support, open firmware and flattened device tree bindings, the rest · Maintainers: Linus Walleij, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Linus Torvalds

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 <andre.przywara@arm.com>
Cc: Sudeep Holla <redacted>
Cc: Linus Walleij <redacted>
Signed-off-by: Rob Herring <robh@kernel.org>
---
 .../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
-- 
2.30.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help