From: Kuninori Morimoto Date: Thu, 16 Dec 2021 00:00:18 +0000 (+0900) Subject: ASoC: dt-bindings: audio-graph-port: enable both flag/phandle for bitclock/frame... X-Git-Tag: irq_urgent_for_v5.17_rc2~48^2~15^2~46 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9b3c847b5fa0364a00227f13ab8ac0cbaf69be83;p=users%2Fdwmw2%2Flinux.git ASoC: dt-bindings: audio-graph-port: enable both flag/phandle for bitclock/frame-master snd_soc_daifmt_parse_clock_provider_raw() is handling both bitclock/frame-master, and is supporting both flag/phandle. Current DT is assuming it is flag style. This patch allows both case. Signed-off-by: Kuninori Morimoto Reviewed-by: Rob Herring Link: https://lore.kernel.org/r/20211216000018.2641925-1-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown --- diff --git a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml index 43e7f86e3b235..476dcb49ece63 100644 --- a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml +++ b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml @@ -42,10 +42,15 @@ patternProperties: $ref: /schemas/types.yaml#/definitions/flag frame-master: description: Indicates dai-link frame master. - $ref: /schemas/types.yaml#/definitions/phandle + oneOf: + - $ref: /schemas/types.yaml#/definitions/flag + - $ref: /schemas/types.yaml#/definitions/phandle bitclock-master: description: Indicates dai-link bit clock master - $ref: /schemas/types.yaml#/definitions/phandle + oneOf: + - $ref: /schemas/types.yaml#/definitions/flag + - $ref: /schemas/types.yaml#/definitions/phandle + dai-format: description: audio format. items: