summaryrefslogtreecommitdiffstats
path: root/sound/soc/amd/acp-da7219-max98357a.c
diff options
context:
space:
mode:
authorAkshu Agrawal2018-03-19 06:37:41 +0100
committerMark Brown2018-03-20 02:18:18 +0100
commitf155181d23608acd3fb46d0d6b1507b68ffa436b (patch)
tree6202d8f0e497658aa21ff2a4e0acef3a4cf69517 /sound/soc/amd/acp-da7219-max98357a.c
parentASoC: amd: modifications in dma stop sequence (diff)
downloadkernel-qcow2-linux-f155181d23608acd3fb46d0d6b1507b68ffa436b.tar.gz
kernel-qcow2-linux-f155181d23608acd3fb46d0d6b1507b68ffa436b.tar.xz
kernel-qcow2-linux-f155181d23608acd3fb46d0d6b1507b68ffa436b.zip
ASoC: amd: Use single dai for da7219 playback and capture
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>
Diffstat (limited to 'sound/soc/amd/acp-da7219-max98357a.c')
-rw-r--r--sound/soc/amd/acp-da7219-max98357a.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c
index bbe0f103e6a8..d07c2a1d5d9e 100644
--- a/sound/soc/amd/acp-da7219-max98357a.c
+++ b/sound/soc/amd/acp-da7219-max98357a.c
@@ -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,
},