Skip to content

Commit 70b416a

Browse files
committed
dt-bindings: arm,coresight-cti: Add missing additionalProperties on child nodes
Just as unevaluatedProperties or additionalProperties are required at the top level of schemas, they should (and will) also be required for child node schemas. That ensures only documented properties are present for any node. Adding additionalProperties constraint on 'trig-conns' nodes results in warnings that 'cpu' and 'arm,cs-dev-assoc' are not allowed. These are already defined for the parent node, but need to be duplicated for the child node. Drop the free form description that the properties also apply to the child nodes. Acked-by: Conor Dooley <conor.dooley@microchip.com> Reviewed-by: Mike Leach <mike.leach@linaro.org> Link: https://lore.kernel.org/r/20230925220511.2026514-2-robh@kernel.org Signed-off-by: Rob Herring <robh@kernel.org>
1 parent 5027cf5 commit 70b416a

File tree

1 file changed

+24
-9
lines changed

1 file changed

+24
-9
lines changed

Documentation/devicetree/bindings/arm/arm,coresight-cti.yaml

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,7 @@ properties:
9393

9494
cpu:
9595
description:
96-
Handle to cpu this device is associated with. This must appear in the
97-
base cti node if compatible string arm,coresight-cti-v8-arch is used,
98-
or may appear in a trig-conns child node when appropriate.
96+
Handle to cpu this CTI is associated with.
9997

10098
power-domains:
10199
maxItems: 1
@@ -112,12 +110,12 @@ properties:
112110
description:
113111
defines a phandle reference to an associated CoreSight trace device.
114112
When the associated trace device is enabled, then the respective CTI
115-
will be enabled. Use in a trig-conns node, or in CTI base node when
116-
compatible string arm,coresight-cti-v8-arch used. If the associated
117-
device has not been registered then the node name will be stored as
118-
the connection name for later resolution. If the associated device is
119-
not a CoreSight device or not registered then the node name will remain
120-
the connection name and automatic enabling will not occur.
113+
will be enabled. Use in CTI base node when compatible string
114+
arm,coresight-cti-v8-arch used. If the associated device has not been
115+
registered then the node name will be stored as the connection name for
116+
later resolution. If the associated device is not a CoreSight device or
117+
not registered then the node name will remain the connection name and
118+
automatic enabling will not occur.
121119

122120
# size cells and address cells required if trig-conns node present.
123121
"#size-cells":
@@ -129,6 +127,8 @@ properties:
129127
patternProperties:
130128
'^trig-conns@([0-9]+)$':
131129
type: object
130+
additionalProperties: false
131+
132132
description:
133133
A trigger connections child node which describes the trigger signals
134134
between this CTI and another hardware device. This device may be a CPU,
@@ -140,6 +140,21 @@ patternProperties:
140140
reg:
141141
maxItems: 1
142142

143+
cpu:
144+
description:
145+
Handle to cpu this trigger connection is associated with.
146+
147+
arm,cs-dev-assoc:
148+
$ref: /schemas/types.yaml#/definitions/phandle
149+
description:
150+
defines a phandle reference to an associated CoreSight trace device.
151+
When the associated trace device is enabled, then the respective CTI
152+
will be enabled. If the associated device has not been registered
153+
then the node name will be stored as the connection name for later
154+
resolution. If the associated device is not a CoreSight device or
155+
not registered then the node name will remain the connection name
156+
and automatic enabling will not occur.
157+
143158
arm,trig-in-sigs:
144159
$ref: /schemas/types.yaml#/definitions/uint32-array
145160
minItems: 1

0 commit comments

Comments
 (0)