Skip to content

Commit 2dc8c03

Browse files
krzkbroonie
authored andcommitted
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>
1 parent c91e671 commit 2dc8c03

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

sound/soc/samsung/odroid.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,13 @@ static int odroid_audio_probe(struct platform_device *pdev)
230230
return ret;
231231
}
232232

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;
239240

240241
card->dai_link = odroid_card_dais;
241242
card->num_links = ARRAY_SIZE(odroid_card_dais);

0 commit comments

Comments
 (0)