aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Miao <eric.miao@linaro.org>2012-01-13 10:56:35 +0800
committerEric Miao <eric.miao@linaro.org>2012-01-13 10:56:35 +0800
commit668c4a3c1feab8972648c8aab0aedc8bbbbaeeea (patch)
tree693f6bb98b6249d93a468754923a77da65bab0f3
parent7ed3b81ab55d9605ba79d3a492089804d9279f1b (diff)
parentb600fde28ec1bce541a451308284097f62d467eb (diff)
downloadlinux-linaro-668c4a3c1feab8972648c8aab0aedc8bbbbaeeea.tar.gz
Merge branch 'topic/lt-3.2-imx6-audio' into lt-3.2-imx6
* topic/lt-3.2-imx6-audio: ENGR00161608 SSI: support 24bit samplerate
-rw-r--r--sound/soc/imx/imx-ssi.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c
index a58440a2345..cd4bfbf3a10 100644
--- a/sound/soc/imx/imx-ssi.c
+++ b/sound/soc/imx/imx-ssi.c
@@ -54,6 +54,9 @@
#include "imx-ssi.h"
#define SSI_SACNT_DEFAULT (SSI_SACNT_AC97EN | SSI_SACNT_FV)
+#define IMX_SSI_FORMATS \
+ (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
+ SNDRV_PCM_FMTBIT_S24_LE)
static const struct of_device_id imx_ssi_dt_ids[] = {
{ .compatible = "fsl,imx1-ssi", },
@@ -477,13 +480,13 @@ static struct snd_soc_dai_driver imx_ssi_dai = {
.channels_min = 1,
.channels_max = 2,
.rates = SNDRV_PCM_RATE_8000_96000,
- .formats = SNDRV_PCM_FMTBIT_S16_LE,
+ .formats = IMX_SSI_FORMATS,
},
.capture = {
.channels_min = 1,
.channels_max = 2,
.rates = SNDRV_PCM_RATE_8000_96000,
- .formats = SNDRV_PCM_FMTBIT_S16_LE,
+ .formats = IMX_SSI_FORMATS,
},
.ops = &imx_ssi_pcm_dai_ops,
};