Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Krzysztof Kozlowski
and committed by
Mark Brown
55ebfafb
ebba2fd5
+7
-3
+7
-3
sound/soc/samsung/aries_wm8994.c
+7
-3
sound/soc/samsung/aries_wm8994.c
···
620
620
/* Update card-name if provided through DT, else use default name */
621
621
snd_soc_of_parse_card_name(card, "model");
622
622
623
-
ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing");
623
+
ret = snd_soc_of_parse_audio_routing(card, "audio-routing");
624
624
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
+
}
627
631
}
628
632
629
633
aries_dai[1].dai_fmt = priv->variant->modem_dai_fmt;