diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-06-06 00:13:20 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-06-06 16:37:24 -0400 |
commit | 4f209c5142dcdd4db29f734d652fba4d2ab6da71 (patch) | |
tree | b004edd069875e8cd40fe939366a433a52d7f18a | |
parent | c3e2a4af64cb74ea66abca1c80aa38b0c9d15567 (diff) |
ASoC: sh: migor: 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>
-rw-r--r-- | sound/soc/sh/migor.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c index 8739c9f60672..991557e25eba 100644 --- a/sound/soc/sh/migor.c +++ b/sound/soc/sh/migor.c | |||
@@ -123,16 +123,18 @@ static const struct snd_soc_dapm_route audio_map[] = { | |||
123 | }; | 123 | }; |
124 | 124 | ||
125 | /* migor digital audio interface glue - connects codec <--> CPU */ | 125 | /* migor digital audio interface glue - connects codec <--> CPU */ |
126 | SND_SOC_DAILINK_DEFS(wm8978, | ||
127 | DAILINK_COMP_ARRAY(COMP_CPU("siu-pcm-audio")), | ||
128 | DAILINK_COMP_ARRAY(COMP_CODEC("wm8978.0-001a", "wm8978-hifi")), | ||
129 | DAILINK_COMP_ARRAY(COMP_PLATFORM("siu-pcm-audio"))); | ||
130 | |||
126 | static struct snd_soc_dai_link migor_dai = { | 131 | static struct snd_soc_dai_link migor_dai = { |
127 | .name = "wm8978", | 132 | .name = "wm8978", |
128 | .stream_name = "WM8978", | 133 | .stream_name = "WM8978", |
129 | .cpu_dai_name = "siu-pcm-audio", | ||
130 | .codec_dai_name = "wm8978-hifi", | ||
131 | .platform_name = "siu-pcm-audio", | ||
132 | .codec_name = "wm8978.0-001a", | ||
133 | .dai_fmt = SND_SOC_DAIFMT_NB_IF | SND_SOC_DAIFMT_I2S | | 134 | .dai_fmt = SND_SOC_DAIFMT_NB_IF | SND_SOC_DAIFMT_I2S | |
134 | SND_SOC_DAIFMT_CBS_CFS, | 135 | SND_SOC_DAIFMT_CBS_CFS, |
135 | .ops = &migor_dai_ops, | 136 | .ops = &migor_dai_ops, |
137 | SND_SOC_DAILINK_REG(wm8978), | ||
136 | }; | 138 | }; |
137 | 139 | ||
138 | /* migor audio machine driver */ | 140 | /* migor audio machine driver */ |