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: