diff options
| author |   Mark Brown <broonie@kernel.org> | 2021-04-23 19:01:00 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-04-23 19:01:00 +0100 |
| commit | d143a69fd452a047440391fcbe290ff416b14ab5 (patch) | |
| tree | 29e6786b204f13d057637e16b9cb9a11116c92ea /sound/soc/amd/raven/acp3x-i2s.c | |
| parent | Linux 5.12-rc8 (diff) | |
| parent | ASoC: adau17x1: Avoid overwriting CHPF (diff) | |
| download | linux-dev-d143a69fd452a047440391fcbe290ff416b14ab5.tar.xz linux-dev-d143a69fd452a047440391fcbe290ff416b14ab5.zip | |
Merge remote-tracking branch 'asoc/for-5.12' into asoc-linus
Diffstat (limited to 'sound/soc/amd/raven/acp3x-i2s.c')
| -rw-r--r-- | sound/soc/amd/raven/acp3x-i2s.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c index 5bc028692fcf..2cd93887410c 100644 --- a/sound/soc/amd/raven/acp3x-i2s.c +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -264,8 +264,7 @@ static struct snd_soc_dai_driver acp3x_i2s_dai = { .playback = { .rates = SNDRV_PCM_RATE_8000_96000, .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | - SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S24_LE | - SNDRV_PCM_FMTBIT_S32_LE, + SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S32_LE, .channels_min = 2, .channels_max = 8, .rate_min = 8000, @@ -274,8 +273,7 @@ static struct snd_soc_dai_driver acp3x_i2s_dai = { .capture = { .rates = SNDRV_PCM_RATE_8000_48000, .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | - SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S24_LE | - SNDRV_PCM_FMTBIT_S32_LE, + SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S32_LE, .channels_min = 2, .channels_max = 2, .rate_min = 8000, |