* [PATCH] ASoC: dt-bindings: renesas, rsnd: Fix duplicate 'allOf' entries
@ 2020-11-19 16:18 Rob Herring
2020-11-20 21:29 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Rob Herring @ 2020-11-19 16:18 UTC (permalink / raw)
To: Mark Brown
Cc: devicetree, Sameer Pujar, alsa-devel, Liam Girdwood, Kuninori Morimoto
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 <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Cc: Sameer Pujar <spujar@nvidia.com>
Cc: alsa-devel@alsa-project.org
Signed-off-by: Rob Herring <robh@kernel.org>
---
Documentation/devicetree/bindings/sound/renesas,rsnd.yaml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml
index cbfd5914b432..0fd37aa84947 100644
--- a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml
+++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml
@@ -9,10 +9,6 @@ title: Renesas R-Car Sound Driver Device Tree Bindings
maintainers:
- Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
-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:
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ASoC: dt-bindings: renesas, rsnd: Fix duplicate 'allOf' entries
2020-11-19 16:18 [PATCH] ASoC: dt-bindings: renesas, rsnd: Fix duplicate 'allOf' entries Rob Herring
@ 2020-11-20 21:29 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2020-11-20 21:29 UTC (permalink / raw)
To: Rob Herring
Cc: devicetree, Sameer Pujar, alsa-devel, Liam Girdwood, Kuninori Morimoto
On Thu, 19 Nov 2020 10:18:48 -0600, Rob Herring wrote:
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-20 21:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-19 16:18 [PATCH] ASoC: dt-bindings: renesas, rsnd: Fix duplicate 'allOf' entries Rob Herring
2020-11-20 21:29 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).