Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Krzysztof Kozlowski and committed by
Mark Brown
c91e6714 55ebfafb

+7 -3
+7 -3
sound/soc/samsung/midas_wm1811.c
··· 476 476 return ret; 477 477 } 478 478 479 - ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing"); 479 + ret = snd_soc_of_parse_audio_routing(card, "audio-routing"); 480 480 if (ret < 0) { 481 - dev_err(dev, "Audio routing invalid/unspecified\n"); 482 - return ret; 481 + /* Backwards compatible way */ 482 + ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing"); 483 + if (ret < 0) { 484 + dev_err(dev, "Audio routing invalid/unspecified\n"); 485 + return ret; 486 + } 483 487 } 484 488 485 489 cpu = of_get_child_by_name(dev->of_node, "cpu");