Commit 55ebfafb authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown

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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230810063300.20151-8-krzysztof.kozlowski@linaro.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent ebba2fd5
...@@ -620,11 +620,15 @@ static int aries_audio_probe(struct platform_device *pdev) ...@@ -620,11 +620,15 @@ static int aries_audio_probe(struct platform_device *pdev)
/* Update card-name if provided through DT, else use default name */ /* Update card-name if provided through DT, else use default name */
snd_soc_of_parse_card_name(card, "model"); snd_soc_of_parse_card_name(card, "model");
ret = snd_soc_of_parse_audio_routing(card, "audio-routing");
if (ret < 0) {
/* Backwards compatible way */
ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing"); ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing");
if (ret < 0) { if (ret < 0) {
dev_err(dev, "Audio routing invalid/unspecified\n"); dev_err(dev, "Audio routing invalid/unspecified\n");
return ret; return ret;
} }
}
aries_dai[1].dai_fmt = priv->variant->modem_dai_fmt; aries_dai[1].dai_fmt = priv->variant->modem_dai_fmt;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment