Skip to content

Commit 55ebfaf

Browse files
krzkbroonie
authored andcommitted
ASoC: samsung: aries_wm8994: parse audio-routing
Parse generic sound card "audio-routing" property and fallback to "samsung,audio-routing" if it is missing. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Link: https://lore.kernel.org/r/20230810063300.20151-8-krzysztof.kozlowski@linaro.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent ebba2fd commit 55ebfaf

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

sound/soc/samsung/aries_wm8994.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -620,10 +620,14 @@ static int aries_audio_probe(struct platform_device *pdev)
620620
/* Update card-name if provided through DT, else use default name */
621621
snd_soc_of_parse_card_name(card, "model");
622622

623-
ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing");
623+
ret = snd_soc_of_parse_audio_routing(card, "audio-routing");
624624
if (ret < 0) {
625-
dev_err(dev, "Audio routing invalid/unspecified\n");
626-
return ret;
625+
/* Backwards compatible way */
626+
ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing");
627+
if (ret < 0) {
628+
dev_err(dev, "Audio routing invalid/unspecified\n");
629+
return ret;
630+
}
627631
}
628632

629633
aries_dai[1].dai_fmt = priv->variant->modem_dai_fmt;

0 commit comments

Comments
 (0)