Skip to contentSkip to conversation

ASoC: dt-bindings: renesas, rsnd: Fix duplicate 'allOf' entries

PATCH In review Rob Herring 2 participants 2 messages Nov 19, 2020 – Nov 20, 2020

Subsystems (3)
lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/1 ASoC: dt-bindings: renesas, rsnd: Fix duplicate 'allOf' entries

Commit e52f3f291152 ("ASoC: audio-graph-card: Refactor schema") added an 'allOf' entry, but one is already present in the schema. Multiple keys is not valid and results in an error:

ruamel.yaml.constructor.DuplicateKeyError: while constructing a mapping
in "<unicode string>", line 4, column 1
found duplicate key "allOf" with value "[]" (original value: "[]")
in "<unicode string>", line 262, column 1

Fixes e52f3f291152 ("ASoC: audio-graph-card: Refactor schema")
Cc Liam Girdwood <[email protected]>
Cc Mark Brown <[email protected]>
Cc Kuninori Morimoto <[email protected]>
Cc Sameer Pujar <[email protected]>
---
 Documentation/devicetree/bindings/sound/renesas,rsnd.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/sound/renesas,rsnd.yaml +2 -4
index cbfd5914b432..0fd37aa84947 100644
@@ -9,10 +9,6 @@ title: Renesas R-Car Sound Driver Device Tree Bindings
 maintainers:
   - Kuninori Morimoto <[email protected]>
 
-allOf:
-  - $ref: audio-graph.yaml#
-  - $ref: audio-graph-port.yaml#
-
 properties:
 
   compatible:
@@ -260,6 +256,8 @@ required:
   - "#sound-dai-cells"
 
 allOf:
+  - $ref: audio-graph.yaml#
+  - $ref: audio-graph-port.yaml#
   - if:
       properties:
         compatible:
Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 8 lines · Rob Herring

Commit e52f3f291152 ("ASoC: audio-graph-card: Refactor schema") added an 'allOf' entry, but one is already present in the schema. Multiple keys is not valid and results in an error:

ruamel.yaml.constructor.DuplicateKeyError: while constructing a mapping
in "<unicode string>", line 4, column 1
found duplicate key "allOf" with value "[]" (original value: "[]")
in "<unicode string>", line 262, column 1

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: dt-bindings: renesas, rsnd: Fix duplicate 'allOf' entries

      commit: 73d2784ecf09d49e319631aea682cb360959355a

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark