Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: samsung: tm2_wm5110: parse audio-routing

Browse Source 
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>
This commit is contained in:
Krzysztof Kozlowski 2023-08-10 08:32:59 +02:00 committed by Mark Brown
parent 2dc8c03665
commit 17b9f4387e
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/samsung/tm2_wm5110.c
View File

@ -523,10 +523,14 @@ static int tm2_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 is not specified or invalid\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 is not specified or invalid\n");
return ret;
}
}
card->aux_dev[0].dlc.of_node = of_parse_phandle(dev->of_node,