hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: samsung: smdk_wm8994: 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 <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-06-19 10:18:09 +09:00 committed by Mark Brown
parent 33949eb501
commit d815e0f08f
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/samsung/smdk_wm8994.c
View File

@ -102,13 +102,11 @@ static int smdk_wm8994_init_paiftx(struct snd_soc_pcm_runtime *rtd)
SND_SOC_DAILINK_DEFS(aif1, SND_SOC_DAILINK_DEFS(aif1,
DAILINK_COMP_ARRAY(COMP_CPU("samsung-i2s.0")), DAILINK_COMP_ARRAY(COMP_CPU("samsung-i2s.0")),
DAILINK_COMP_ARRAY(COMP_CODEC("wm8994-codec", "wm8994-aif1")), DAILINK_COMP_ARRAY(COMP_CODEC("wm8994-codec", "wm8994-aif1")));
DAILINK_COMP_ARRAY(COMP_PLATFORM("samsung-i2s.0")));
SND_SOC_DAILINK_DEFS(fifo_tx, SND_SOC_DAILINK_DEFS(fifo_tx,
DAILINK_COMP_ARRAY(COMP_CPU("samsung-i2s-sec")), DAILINK_COMP_ARRAY(COMP_CPU("samsung-i2s-sec")),
DAILINK_COMP_ARRAY(COMP_CODEC("wm8994-codec", "wm8994-aif1")), DAILINK_COMP_ARRAY(COMP_CODEC("wm8994-codec", "wm8994-aif1")));
DAILINK_COMP_ARRAY(COMP_PLATFORM("samsung-i2s-sec")));
static struct snd_soc_dai_link smdk_dai[] = { static struct snd_soc_dai_link smdk_dai[] = {
{ /* Primary DAI i/f */ { /* Primary DAI i/f */
@ -165,9 +163,6 @@ static int smdk_audio_probe(struct platform_device *pdev)
"Property 'samsung,i2s-controller' missing or invalid\n"); "Property 'samsung,i2s-controller' missing or invalid\n");
ret = -EINVAL; ret = -EINVAL;
} }
smdk_dai[0].platforms->name = NULL;
smdk_dai[0].platforms->of_node = smdk_dai[0].cpus->of_node;
} }
id = of_match_device(of_match_ptr(samsung_wm8994_of_match), &pdev->dev); id = of_match_device(of_match_ptr(samsung_wm8994_of_match), &pdev->dev);