Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ASoC: samsung: odroid: 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-10-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
authored by
Krzysztof Kozlowski
and committed by
Mark Brown
2dc8c036
c91e6714
+7
-6
+7
-6
sound/soc/samsung/odroid.c
+7
-6
sound/soc/samsung/odroid.c
···
230
230
return ret;
231
231
}
232
232
233
-
if (of_property_present(dev->of_node, "samsung,audio-routing")) {
234
-
ret = snd_soc_of_parse_audio_routing(card,
235
-
"samsung,audio-routing");
236
-
if (ret < 0)
237
-
return ret;
238
-
}
233
+
ret = 0;
234
+
if (of_property_present(dev->of_node, "audio-routing"))
235
+
ret = snd_soc_of_parse_audio_routing(card, "audio-routing");
236
+
else if (of_property_present(dev->of_node, "samsung,audio-routing"))
237
+
ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing");
238
+
if (ret < 0)
239
+
return ret;
239
240
240
241
card->dai_link = odroid_card_dais;
241
242
card->num_links = ARRAY_SIZE(odroid_card_dais);