diff options
| author | Kuninori Morimoto | 2019-06-06 06:20:10 +0200 |
|---|---|---|
| committer | Mark Brown | 2019-06-06 23:12:44 +0200 |
| commit | 6bf449c4c49a90ea973fb9b17418a79c53598b11 (patch) | |
| tree | 2f26f85bf9b4d144fff26f55507b657f87f65f32 /sound/soc/intel | |
| parent | ASoC: Intel: bxt_rt298: use modern dai_link style (diff) | |
| download | kernel-qcow2-linux-6bf449c4c49a90ea973fb9b17418a79c53598b11.tar.gz kernel-qcow2-linux-6bf449c4c49a90ea973fb9b17418a79c53598b11.tar.xz kernel-qcow2-linux-6bf449c4c49a90ea973fb9b17418a79c53598b11.zip | |
ASoC: Intel: byt-rt5640: 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>
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/boards/byt-rt5640.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/intel/boards/byt-rt5640.c b/sound/soc/intel/boards/byt-rt5640.c index df902d82145e..483043f1650f 100644 --- a/sound/soc/intel/boards/byt-rt5640.c +++ b/sound/soc/intel/boards/byt-rt5640.c @@ -180,18 +180,20 @@ static struct snd_soc_ops byt_rt5640_ops = { .hw_params = byt_rt5640_hw_params, }; +SND_SOC_DAILINK_DEFS(audio, + DAILINK_COMP_ARRAY(COMP_CPU("baytrail-pcm-audio")), + DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC5640:00", "rt5640-aif1")), + DAILINK_COMP_ARRAY(COMP_PLATFORM("baytrail-pcm-audio"))); + static struct snd_soc_dai_link byt_rt5640_dais[] = { { .name = "Baytrail Audio", .stream_name = "Audio", - .cpu_dai_name = "baytrail-pcm-audio", - .codec_dai_name = "rt5640-aif1", - .codec_name = "i2c-10EC5640:00", - .platform_name = "baytrail-pcm-audio", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, .init = byt_rt5640_init, .ops = &byt_rt5640_ops, + SND_SOC_DAILINK_REG(audio), }, }; |