From: Kuninori Morimoto Date: Wed, 19 Jun 2019 01:19:08 +0000 (+0900) Subject: ASoC: ti: davinci-evm: don't select unnecessary Platform X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f46da1b9046e;p=openwrt%2Fstaging%2Fblogic.git ASoC: ti: davinci-evm: don't select unnecessary Platform ALSA SoC is now supporting "no Platform". Sound card doesn't need to select "CPU component" as "Platform" anymore if it doesn't need special Platform. This patch removes such settings. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- diff --git a/sound/soc/ti/davinci-evm.c b/sound/soc/ti/davinci-evm.c index bd822bc8040f..d920befc3e10 100644 --- a/sound/soc/ti/davinci-evm.c +++ b/sound/soc/ti/davinci-evm.c @@ -356,8 +356,7 @@ static struct snd_soc_card da850_snd_soc_card = { */ SND_SOC_DAILINK_DEFS(evm, DAILINK_COMP_ARRAY(COMP_EMPTY()), - DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "tlv320aic3x-hifi")), - DAILINK_COMP_ARRAY(COMP_EMPTY())); + DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "tlv320aic3x-hifi"))); static struct snd_soc_dai_link evm_dai_tlv320aic3x = { .name = "TLV320AIC3X", @@ -411,8 +410,6 @@ static int davinci_evm_probe(struct platform_device *pdev) if (!dai->cpus->of_node) return -EINVAL; - dai->platforms->of_node = dai->cpus->of_node; - evm_soc_card.dev = &pdev->dev; ret = snd_soc_of_parse_card_name(&evm_soc_card, "ti,model"); if (ret)