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>

diff --git a/sound/soc/samsung/aries_wm8994.c b/sound/soc/samsung/aries_wm8994.c
index 7492bb4..dd3cd2c 100644 (file)
--- a/sound/soc/samsung/aries_wm8994.c
+++ b/sound/soc/samsung/aries_wm8994.c
@@ -620,10 +620,14 @@ static int aries_audio_probe(struct platform_device *pdev)
        /* Update card-name if provided through DT, else use default name */
        snd_soc_of_parse_card_name(card, "model");
 
-       ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing");
+       ret = snd_soc_of_parse_audio_routing(card, "audio-routing");
        if (ret < 0) {
-               dev_err(dev, "Audio routing invalid/unspecified\n");
-               return ret;
+               /* Backwards compatible way */
+               ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing");
+               if (ret < 0) {
+                       dev_err(dev, "Audio routing invalid/unspecified\n");
+                       return ret;
+               }
        }
 
        aries_dai[1].dai_fmt = priv->variant->modem_dai_fmt;