projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
55ebfaf
)
ASoC: samsung: midas_wm1811: parse audio-routing
author
Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org>
Thu, 10 Aug 2023 06:32:57 +0000
(08:32 +0200)
committer
Mark Brown
<broonie@kernel.org>
Wed, 16 Aug 2023 13:47:18 +0000
(14:47 +0100)
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>
sound/soc/samsung/midas_wm1811.c
patch
|
blob
|
history
diff --git
a/sound/soc/samsung/midas_wm1811.c
b/sound/soc/samsung/midas_wm1811.c
index 126098fdcf1b4e6e60e247c7282110eff33ab398..2ec7e16ddfa216ce97c578629a1171e569133ada 100644
(file)
--- 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");