mirror of https://gitee.com/openkylin/linux.git
ASoC: Intel: bytcht_da7213: use modern dai_link style
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:
parent
365a8a586a
commit
fb1d4861f2
|
@ -158,42 +158,50 @@ static const struct snd_soc_ops ssp2_ops = {
|
|||
|
||||
};
|
||||
|
||||
SND_SOC_DAILINK_DEF(dummy,
|
||||
DAILINK_COMP_ARRAY(COMP_DUMMY()));
|
||||
|
||||
SND_SOC_DAILINK_DEF(media,
|
||||
DAILINK_COMP_ARRAY(COMP_CPU("media-cpu-dai")));
|
||||
|
||||
SND_SOC_DAILINK_DEF(deepbuffer,
|
||||
DAILINK_COMP_ARRAY(COMP_CPU("deepbuffer-cpu-dai")));
|
||||
|
||||
SND_SOC_DAILINK_DEF(ssp2_port,
|
||||
DAILINK_COMP_ARRAY(COMP_CPU("ssp2-port")));
|
||||
SND_SOC_DAILINK_DEF(ssp2_codec,
|
||||
DAILINK_COMP_ARRAY(COMP_CODEC("i2c-DLGS7213:00",
|
||||
"da7213-hifi")));
|
||||
|
||||
SND_SOC_DAILINK_DEF(platform,
|
||||
DAILINK_COMP_ARRAY(COMP_PLATFORM("sst-mfld-platform")));
|
||||
|
||||
static struct snd_soc_dai_link dailink[] = {
|
||||
[MERR_DPCM_AUDIO] = {
|
||||
.name = "Audio Port",
|
||||
.stream_name = "Audio",
|
||||
.cpu_dai_name = "media-cpu-dai",
|
||||
.codec_dai_name = "snd-soc-dummy-dai",
|
||||
.codec_name = "snd-soc-dummy",
|
||||
.platform_name = "sst-mfld-platform",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.ops = &aif1_ops,
|
||||
SND_SOC_DAILINK_REG(media, dummy, platform),
|
||||
},
|
||||
[MERR_DPCM_DEEP_BUFFER] = {
|
||||
.name = "Deep-Buffer Audio Port",
|
||||
.stream_name = "Deep-Buffer Audio",
|
||||
.cpu_dai_name = "deepbuffer-cpu-dai",
|
||||
.codec_dai_name = "snd-soc-dummy-dai",
|
||||
.codec_name = "snd-soc-dummy",
|
||||
.platform_name = "sst-mfld-platform",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.ops = &aif1_ops,
|
||||
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
|
||||
},
|
||||
/* CODEC<->CODEC link */
|
||||
/* back ends */
|
||||
{
|
||||
.name = "SSP2-Codec",
|
||||
.id = 0,
|
||||
.cpu_dai_name = "ssp2-port",
|
||||
.platform_name = "sst-mfld-platform",
|
||||
.no_pcm = 1,
|
||||
.codec_dai_name = "da7213-hifi",
|
||||
.codec_name = "i2c-DLGS7213:00",
|
||||
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
|
||||
| SND_SOC_DAIFMT_CBS_CFS,
|
||||
.be_hw_params_fixup = codec_fixup,
|
||||
|
@ -201,6 +209,7 @@ static struct snd_soc_dai_link dailink[] = {
|
|||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.ops = &ssp2_ops,
|
||||
SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
|
||||
},
|
||||
};
|
||||
|
||||
|
@ -236,7 +245,7 @@ static int bytcht_da7213_probe(struct platform_device *pdev)
|
|||
|
||||
/* fix index of codec dai */
|
||||
for (i = 0; i < ARRAY_SIZE(dailink); i++) {
|
||||
if (!strcmp(dailink[i].codec_name, "i2c-DLGS7213:00")) {
|
||||
if (!strcmp(dailink[i].codecs->name, "i2c-DLGS7213:00")) {
|
||||
dai_index = i;
|
||||
break;
|
||||
}
|
||||
|
@ -248,7 +257,7 @@ static int bytcht_da7213_probe(struct platform_device *pdev)
|
|||
snprintf(codec_name, sizeof(codec_name),
|
||||
"i2c-%s", acpi_dev_name(adev));
|
||||
put_device(&adev->dev);
|
||||
dailink[dai_index].codec_name = codec_name;
|
||||
dailink[dai_index].codecs->name = codec_name;
|
||||
}
|
||||
|
||||
/* override plaform name, if required */
|
||||
|
|
Loading…
Reference in New Issue