diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-06-06 00:13:24 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-06-06 16:37:35 -0400 |
commit | f9aaa1929b2e828d87aee9adb003cd19fbf18f57 (patch) | |
tree | b0340fe2364f24b19a419d76b141e5f10c3d4e86 | |
parent | 4f209c5142dcdd4db29f734d652fba4d2ab6da71 (diff) |
ASoC: sh: sh7760-ac97: 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/sh7760-ac97.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/soc/sh/sh7760-ac97.c b/sound/soc/sh/sh7760-ac97.c index 4bb4c13cf860..d267243a159b 100644 --- a/sound/soc/sh/sh7760-ac97.c +++ b/sound/soc/sh/sh7760-ac97.c | |||
@@ -14,14 +14,15 @@ | |||
14 | 14 | ||
15 | #define IPSEL 0xFE400034 | 15 | #define IPSEL 0xFE400034 |
16 | 16 | ||
17 | SND_SOC_DAILINK_DEFS(ac97, | ||
18 | DAILINK_COMP_ARRAY(COMP_CPU("hac-dai.0")), /* HAC0 */ | ||
19 | DAILINK_COMP_ARRAY(COMP_CODEC("ac97-codec", "ac97-hifi")), | ||
20 | DAILINK_COMP_ARRAY(COMP_PLATFORM("sh7760-pcm-audio"))); | ||
21 | |||
17 | static struct snd_soc_dai_link sh7760_ac97_dai = { | 22 | static struct snd_soc_dai_link sh7760_ac97_dai = { |
18 | .name = "AC97", | 23 | .name = "AC97", |
19 | .stream_name = "AC97 HiFi", | 24 | .stream_name = "AC97 HiFi", |
20 | .cpu_dai_name = "hac-dai.0", /* HAC0 */ | 25 | SND_SOC_DAILINK_REG(ac97), |
21 | .codec_dai_name = "ac97-hifi", | ||
22 | .platform_name = "sh7760-pcm-audio", | ||
23 | .codec_name = "ac97-codec", | ||
24 | .ops = NULL, | ||
25 | }; | 26 | }; |
26 | 27 | ||
27 | static struct snd_soc_card sh7760_ac97_soc_machine = { | 28 | static struct snd_soc_card sh7760_ac97_soc_machine = { |