diff options
author | Mark Brown <broonie@kernel.org> | 2019-09-09 14:55:20 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-09-09 14:55:20 +0100 |
commit | bb831786117519fc16dfd3eaa7b84e4f6bbb8d99 (patch) | |
tree | 18f8333bbaf6918a0246113eeb0f056011e436f2 /sound/soc/ti/davinci-i2s.c | |
parent | 6652ddbb5d83ecfc2591b92be063519714e40ebf (diff) | |
parent | 6fa5963c37a2e3335eba0b7455e35a01318ebc15 (diff) | |
download | linux-bb831786117519fc16dfd3eaa7b84e4f6bbb8d99.tar.bz2 |
Merge branch 'asoc-5.4' into asoc-next
Diffstat (limited to 'sound/soc/ti/davinci-i2s.c')
-rw-r--r-- | sound/soc/ti/davinci-i2s.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/soc/ti/davinci-i2s.c b/sound/soc/ti/davinci-i2s.c index 27afdbb9adf3..d89b5c928c4d 100644 --- a/sound/soc/ti/davinci-i2s.c +++ b/sound/soc/ti/davinci-i2s.c @@ -598,6 +598,8 @@ static void davinci_i2s_shutdown(struct snd_pcm_substream *substream, } #define DAVINCI_I2S_RATES SNDRV_PCM_RATE_8000_96000 +#define DAVINCI_I2S_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ + SNDRV_PCM_FMTBIT_S32_LE) static const struct snd_soc_dai_ops davinci_i2s_dai_ops = { .shutdown = davinci_i2s_shutdown, @@ -625,12 +627,14 @@ static struct snd_soc_dai_driver davinci_i2s_dai = { .channels_min = 2, .channels_max = 2, .rates = DAVINCI_I2S_RATES, - .formats = SNDRV_PCM_FMTBIT_S16_LE,}, + .formats = DAVINCI_I2S_FORMATS, + }, .capture = { .channels_min = 2, .channels_max = 2, .rates = DAVINCI_I2S_RATES, - .formats = SNDRV_PCM_FMTBIT_S16_LE,}, + .formats = DAVINCI_I2S_FORMATS, + }, .ops = &davinci_i2s_dai_ops, }; |