Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: Intel: bdw-rt5677: use modern dai_link style

Browse Source 
ASoC is now supporting modern style dai_link
(= snd_soc_dai_link_component) for CPU/Codec/Platform.
This patch switches to use it.

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-06 13:19:30 +09:00 committed by Mark Brown
parent 7ba06110de
commit 3f6c2a2e9a
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sound/soc/intel/boards/bdw-rt5677.c
View File

@ -257,16 +257,24 @@ static int bdw_rt5677_init(struct snd_soc_pcm_runtime *rtd)
} }
/* broadwell digital audio interface glue - connects codec <--> CPU */ /* broadwell digital audio interface glue - connects codec <--> CPU */
SND_SOC_DAILINK_DEF(dummy,
DAILINK_COMP_ARRAY(COMP_DUMMY()));
SND_SOC_DAILINK_DEF(fe,
DAILINK_COMP_ARRAY(COMP_CPU("System Pin")));
SND_SOC_DAILINK_DEF(platform,
DAILINK_COMP_ARRAY(COMP_PLATFORM("haswell-pcm-audio")));
SND_SOC_DAILINK_DEF(be,
DAILINK_COMP_ARRAY(COMP_CODEC("i2c-RT5677CE:00", "rt5677-aif1")));
static struct snd_soc_dai_link bdw_rt5677_dais[] = { static struct snd_soc_dai_link bdw_rt5677_dais[] = {
/* Front End DAI links */ /* Front End DAI links */
{ {
.name = "System PCM", .name = "System PCM",
.stream_name = "System Playback/Capture", .stream_name = "System Playback/Capture",
.cpu_dai_name = "System Pin",
.platform_name = "haswell-pcm-audio",
.dynamic = 1, .dynamic = 1,
.codec_name = "snd-soc-dummy",
.codec_dai_name = "snd-soc-dummy-dai",
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL) #if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL)
.init = bdw_rt5677_rtd_init, .init = bdw_rt5677_rtd_init,
#endif #endif
@ -276,6 +284,7 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = {
}, },
.dpcm_capture = 1, .dpcm_capture = 1,
.dpcm_playback = 1, .dpcm_playback = 1,
SND_SOC_DAILINK_REG(fe, dummy, platform),
}, },
/* Back End DAI links */ /* Back End DAI links */
@ -283,11 +292,7 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = {
/* SSP0 - Codec */ /* SSP0 - Codec */
.name = "Codec", .name = "Codec",
.id = 0, .id = 0,
.cpu_dai_name = "snd-soc-dummy-dai",
.platform_name = "snd-soc-dummy",
.no_pcm = 1, .no_pcm = 1,
.codec_name = "i2c-RT5677CE:00",
.codec_dai_name = "rt5677-aif1",
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBS_CFS,
.ignore_suspend = 1, .ignore_suspend = 1,
@ -297,6 +302,7 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = {
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
.init = bdw_rt5677_init, .init = bdw_rt5677_init,
SND_SOC_DAILINK_REG(dummy, be, dummy),
}, },
}; };