diff options
| author |   Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> | 2023-08-10 08:32:57 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2023-08-16 14:47:18 +0100 |
| commit | c91e67145bc6d03f94416f7fbe566c6f6751cd47 (patch) | |
| tree | 121a50bcce4a9f023835b59b378ba2eb123822a7 /sound/soc/samsung | |
| parent | ASoC: samsung: aries_wm8994: parse audio-routing (diff) | |
| download | wireguard-linux-c91e67145bc6d03f94416f7fbe566c6f6751cd47.tar.xz wireguard-linux-c91e67145bc6d03f94416f7fbe566c6f6751cd47.zip | |
ASoC: samsung: midas_wm1811: 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-9-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/samsung')
| -rw-r--r-- | sound/soc/samsung/midas_wm1811.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sound/soc/samsung/midas_wm1811.c b/sound/soc/samsung/midas_wm1811.c index 126098fdcf1b..2ec7e16ddfa2 100644 --- a/sound/soc/samsung/midas_wm1811.c +++ b/sound/soc/samsung/midas_wm1811.c @@ -476,10 +476,14 @@ static int midas_probe(struct platform_device *pdev) return ret; } - 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; + } } cpu = of_get_child_by_name(dev->of_node, "cpu"); |