diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-06-06 13:09:36 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-06 21:28:46 +0100 |
| commit | 19bca225e7202710529a14e916a783b1aa42720b (patch) | |
| tree | 2d3269c20f6cb1be5d803cf3195406281a43ea23 /sound/soc/samsung | |
| parent | 930f74a171f5f3a5acc551568c6a1515344ceef1 (diff) | |
| download | linux-stable-19bca225e7202710529a14e916a783b1aa42720b.tar.gz linux-stable-19bca225e7202710529a14e916a783b1aa42720b.tar.bz2 linux-stable-19bca225e7202710529a14e916a783b1aa42720b.zip | |
ASoC: samsung: tobermory: 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/samsung')
| -rw-r--r-- | sound/soc/samsung/tobermory.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/samsung/tobermory.c b/sound/soc/samsung/tobermory.c index 14b11acb12a4..ef51f289fbc7 100644 --- a/sound/soc/samsung/tobermory.c +++ b/sound/soc/samsung/tobermory.c @@ -109,17 +109,19 @@ static struct snd_soc_ops tobermory_ops = { .hw_params = tobermory_hw_params, }; +SND_SOC_DAILINK_DEFS(cpu, + DAILINK_COMP_ARRAY(COMP_CPU("samsung-i2s.0")), + DAILINK_COMP_ARRAY(COMP_CODEC("wm8962.1-001a", "wm8962")), + DAILINK_COMP_ARRAY(COMP_PLATFORM("samsung-i2s.0"))); + static struct snd_soc_dai_link tobermory_dai[] = { { .name = "CPU", .stream_name = "CPU", - .cpu_dai_name = "samsung-i2s.0", - .codec_dai_name = "wm8962", - .platform_name = "samsung-i2s.0", - .codec_name = "wm8962.1-001a", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM, .ops = &tobermory_ops, + SND_SOC_DAILINK_REG(cpu), }, }; |