Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ASoC: samsung: tm2_wm5110: 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-11-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
authored by
Krzysztof Kozlowski
and committed by
Mark Brown
17b9f438
2dc8c036
+7
-3
+7
-3
sound/soc/samsung/tm2_wm5110.c
+7
-3
sound/soc/samsung/tm2_wm5110.c
···
523
523
return ret;
524
524
}
525
525
526
-
ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing");
526
+
ret = snd_soc_of_parse_audio_routing(card, "audio-routing");
527
527
if (ret < 0) {
528
-
dev_err(dev, "Audio routing is not specified or invalid\n");
529
-
return ret;
528
+
/* Backwards compatible way */
529
+
ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing");
530
+
if (ret < 0) {
531
+
dev_err(dev, "Audio routing is not specified or invalid\n");
532
+
return ret;
533
+
}
530
534
}
531
535
532
536
card->aux_dev[0].dlc.of_node = of_parse_phandle(dev->of_node,