From: Rob Herring Date: Thu, 19 Nov 2020 16:18:48 +0000 (-0600) Subject: ASoC: dt-bindings: renesas, rsnd: Fix duplicate 'allOf' entries X-Git-Tag: v5.11-rc1~168^2^2^2~73 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73d2784ecf09d49e319631aea682cb360959355a;p=thirdparty%2Fkernel%2Flinux.git 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 "", line 4, column 1 found duplicate key "allOf" with value "[]" (original value: "[]") in "", line 262, column 1 Fixes: e52f3f291152 ("ASoC: audio-graph-card: Refactor schema") Cc: Liam Girdwood Cc: Mark Brown Cc: Kuninori Morimoto Cc: Sameer Pujar Cc: alsa-devel@alsa-project.org Signed-off-by: Rob Herring Link: https://lore.kernel.org/r/20201119161848.3379929-1-robh@kernel.org Signed-off-by: Mark Brown --- diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml index cbfd5914b4329..0fd37aa84947a 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 -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: