OSDN Git Service

ASoC: amd: Use single dai for da7219 playback and capture
authorAkshu Agrawal <akshu.agrawal@amd.com>
Mon, 19 Mar 2018 05:37:41 +0000 (11:07 +0530)
committerMark Brown <broonie@kernel.org>
Tue, 20 Mar 2018 01:18:18 +0000 (09:18 +0800)
BT I2S is a bi-directional dai, we will use the same
cpu dai for playback and capture.

TEST=aplay -D hw:0,0 -vv <file>
arecord -D hw:0,0 -f dat -d 5 -vv <file>

Signed-off-by: Akshu Agrawal <akshu.agrawal@amd.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/amd/acp-da7219-max98357a.c

index bbe0f10..d07c2a1 100644 (file)
@@ -124,8 +124,8 @@ static struct snd_soc_ops cz_da7219_cap_ops = {
 
 static struct snd_soc_dai_link cz_dai_7219_98357[] = {
        {
-               .name = "amd-da7219-play",
-               .stream_name = "Playback",
+               .name = "amd-da7219-play-cap",
+               .stream_name = "Playback and Capture",
                .platform_name = "acp_audio_dma.0.auto",
                .cpu_dai_name = "designware-i2s.3.auto",
                .codec_dai_name = "da7219-hifi",
@@ -134,16 +134,6 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
                                | SND_SOC_DAIFMT_CBM_CFM,
                .init = cz_da7219_init,
                .dpcm_playback = 1,
-       },
-       {
-               .name = "amd-da7219-cap",
-               .stream_name = "Capture",
-               .platform_name = "acp_audio_dma.0.auto",
-               .cpu_dai_name = "designware-i2s.4.auto",
-               .codec_dai_name = "da7219-hifi",
-               .codec_name = "i2c-DLGS7219:00",
-               .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
                .dpcm_capture = 1,
                .ops = &cz_da7219_cap_ops,
        },