diff options
| author | Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> | 2023-08-10 08:32:56 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-08-16 15:47:17 +0200 |
| commit | 55ebfafbc32db54259d91383faf65a5bc6bef382 (patch) | |
| tree | dc38474a785a93b8bd5cc253ddb23f9958fcd6bc /sound/soc/samsung | |
| parent | ASoC: samsung: odroid: use of_property_present to check for property (diff) | |
| download | linux-55ebfafbc32db54259d91383faf65a5bc6bef382.tar.xz linux-55ebfafbc32db54259d91383faf65a5bc6bef382.zip | |
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>
Diffstat (limited to 'sound/soc/samsung')
| -rw-r--r-- | sound/soc/samsung/aries_wm8994.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sound/soc/samsung/aries_wm8994.c b/sound/soc/samsung/aries_wm8994.c index 7492bb41456c..dd3cd2c9644a 100644 --- 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; |