diff options
author | Andreas Pretzsch <apr@cn-eng.de> | 2014-01-07 16:34:41 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-01-08 07:51:12 -0500 |
commit | 7ae2b55b0129ecb63d73129ddcba6dcda0d37332 (patch) | |
tree | 831be23545737c1ee16b4373fd350ae5d2d3db09 /sound/soc | |
parent | a010ff628c0953e6c914ecd09678363848617a88 (diff) |
ASoC: ssm2602: add 16kHz sampling rate support
SSM260x also supports 16kHz with external master clocks of 12.000MHz,
12.288MHz and 18.432MHz.
Add matching coefficients, update constraints and announced rates.
Signed-off-by: Andreas Pretzsch <apr@cn-eng.de>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/ssm2602.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index c6dd48561884..af76bbd1b24f 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c | |||
@@ -194,7 +194,7 @@ static const struct snd_soc_dapm_route ssm2604_routes[] = { | |||
194 | }; | 194 | }; |
195 | 195 | ||
196 | static const unsigned int ssm2602_rates_12288000[] = { | 196 | static const unsigned int ssm2602_rates_12288000[] = { |
197 | 8000, 32000, 48000, 96000, | 197 | 8000, 16000, 32000, 48000, 96000, |
198 | }; | 198 | }; |
199 | 199 | ||
200 | static struct snd_pcm_hw_constraint_list ssm2602_constraints_12288000 = { | 200 | static struct snd_pcm_hw_constraint_list ssm2602_constraints_12288000 = { |
@@ -231,6 +231,11 @@ static const struct ssm2602_coeff ssm2602_coeff_table[] = { | |||
231 | {18432000, 32000, SSM2602_COEFF_SRATE(0x6, 0x1, 0x0)}, | 231 | {18432000, 32000, SSM2602_COEFF_SRATE(0x6, 0x1, 0x0)}, |
232 | {12000000, 32000, SSM2602_COEFF_SRATE(0x6, 0x0, 0x1)}, | 232 | {12000000, 32000, SSM2602_COEFF_SRATE(0x6, 0x0, 0x1)}, |
233 | 233 | ||
234 | /* 16k */ | ||
235 | {12288000, 16000, SSM2602_COEFF_SRATE(0x5, 0x0, 0x0)}, | ||
236 | {18432000, 16000, SSM2602_COEFF_SRATE(0x5, 0x1, 0x0)}, | ||
237 | {12000000, 16000, SSM2602_COEFF_SRATE(0xa, 0x0, 0x1)}, | ||
238 | |||
234 | /* 8k */ | 239 | /* 8k */ |
235 | {12288000, 8000, SSM2602_COEFF_SRATE(0x3, 0x0, 0x0)}, | 240 | {12288000, 8000, SSM2602_COEFF_SRATE(0x3, 0x0, 0x0)}, |
236 | {18432000, 8000, SSM2602_COEFF_SRATE(0x3, 0x1, 0x0)}, | 241 | {18432000, 8000, SSM2602_COEFF_SRATE(0x3, 0x1, 0x0)}, |
@@ -473,9 +478,10 @@ static int ssm2602_set_bias_level(struct snd_soc_codec *codec, | |||
473 | return 0; | 478 | return 0; |
474 | } | 479 | } |
475 | 480 | ||
476 | #define SSM2602_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_32000 |\ | 481 | #define SSM2602_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\ |
477 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\ | 482 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |\ |
478 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000) | 483 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |\ |
484 | SNDRV_PCM_RATE_96000) | ||
479 | 485 | ||
480 | #define SSM2602_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ | 486 | #define SSM2602_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ |
481 | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) | 487 | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) |