Unverified Commit 2dc8c036 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files

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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230810063300.20151-10-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c91e6714

sound/soc/samsung/odroid.c

+7 −6
Original line number Diff line number Diff line
@@ -230,12 +230,13 @@ static int odroid_audio_probe(struct platform_device *pdev) 
			return ret;

	}



	if (of_property_present(dev->of_node, "samsung,audio-routing")) {

		ret = snd_soc_of_parse_audio_routing(card,

						"samsung,audio-routing");

	ret = 0;

	if (of_property_present(dev->of_node, "audio-routing"))

		ret = snd_soc_of_parse_audio_routing(card, "audio-routing");

	else if (of_property_present(dev->of_node, "samsung,audio-routing"))

		ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing");

	if (ret < 0)

		return ret;

	}



	card->dai_link = odroid_card_dais;

	card->num_links = ARRAY_SIZE(odroid_card_dais);