ASoC: samsung: odroid: 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-10-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c
index 1743bd55ba1a3148c650a12f969f9676cb4ae2bb..c93cb5a864269fc9ad4862997cf5a9664c86f88e 100644 (file)
--- a/sound/soc/samsung/odroid.c
+++ b/sound/soc/samsung/odroid.c
@@ -230,12 +230,13 @@ static int odroid_audio_probe(struct platform_device *pdev)
                        return ret;
        }
 
-       if (of_property_present(dev->of_node, "samsung,audio-routing")) {
-               ret = snd_soc_of_parse_audio_routing(card,
-                                               "samsung,audio-routing");
-               if (ret < 0)
-                       return ret;
-       }
+       ret = 0;
+       if (of_property_present(dev->of_node, "audio-routing"))
+               ret = snd_soc_of_parse_audio_routing(card, "audio-routing");
+       else if (of_property_present(dev->of_node, "samsung,audio-routing"))
+               ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing");
+       if (ret < 0)
+               return ret;
 
        card->dai_link = odroid_card_dais;
        card->num_links = ARRAY_SIZE(odroid_card_dais);