Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit dee5183

Browse files
robherringlag-linaro
authored andcommitted
dt-bindings: mfd: aspeed: Drop 'oneOf' for pinctrl node
The use of 'oneOf' to include 1 of 3 possible child node schemas results in error messages containing the actual error message(s) for the correct SoC buried in the tons of error messages from the 2 schemas that don't apply. It also causes the pinctrl schema to be applied twice as it will be applied when the compatible matches. All that's really needed in the parent schema is to ensure one of the possible compatible strings is present in the pinctrl node so that its schema will be applied separately. Signed-off-by: Rob Herring (Arm) <robh@kernel.org> Reviewed-by: Andrew Jeffery <andrew@codeconstruct.com.au> Link: https://lore.kernel.org/r/20240430172520.535179-1-robh@kernel.org Signed-off-by: Lee Jones <lee@kernel.org>
1 parent 3555d80 commit dee5183

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

Documentation/devicetree/bindings/mfd/aspeed,ast2x00-scu.yaml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,18 @@ patternProperties:
4747
type: object
4848

4949
'^pinctrl(@[0-9a-f]+)?$':
50-
oneOf:
51-
- $ref: /schemas/pinctrl/aspeed,ast2400-pinctrl.yaml
52-
- $ref: /schemas/pinctrl/aspeed,ast2500-pinctrl.yaml
53-
- $ref: /schemas/pinctrl/aspeed,ast2600-pinctrl.yaml
50+
type: object
51+
additionalProperties: true
52+
properties:
53+
compatible:
54+
contains:
55+
enum:
56+
- aspeed,ast2400-pinctrl
57+
- aspeed,ast2500-pinctrl
58+
- aspeed,ast2600-pinctrl
59+
60+
required:
61+
- compatible
5462

5563
'^interrupt-controller@[0-9a-f]+$':
5664
description: See Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt

0 commit comments

Comments
 (0)