diff options
| author | Zidan Wang <zidan.wang@freescale.com> | 2015-06-04 16:13:57 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2015-09-17 09:23:29 -0500 |
| commit | fd2d61dd22973996eead6ecfd095d1fd728848cf (patch) | |
| tree | 3f6a7efb604a7e313362aa793be93d60be99718d /sound | |
| parent | a2a024b0a33d330cd2749336276cabac13d67bbd (diff) | |
MLK-11030-1 ASoC: imx-wm8960: change rate constraint list and remove sample bit constraint list
wm8960 just support 8k 11.025k 16k 22.05k 32k 44.1k and 48k sample
rate. Change rate constraint list to support 8k 16k 32k and 48k for
SAI master mode.
After set SAI MCLK frequency to 36864000HZ, SAI master mode can full
support 16 24 and 32 bit word length and 8k 16k 32k, 48k sample rate.
No need to add sample bit constraint list to restrict physical length,
so remove it.
Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/imx-wm8960.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/sound/soc/fsl/imx-wm8960.c b/sound/soc/fsl/imx-wm8960.c index 51eb9fbdfcb0..0406d6716b6a 100644 --- a/sound/soc/fsl/imx-wm8960.c +++ b/sound/soc/fsl/imx-wm8960.c @@ -378,20 +378,12 @@ static int imx_hifi_hw_free(struct snd_pcm_substream *substream) return 0; } -static u32 imx_wm8960_rates[] = { - 8000, 16000, 32000, 48000, 64000, 96000 -}; +static u32 imx_wm8960_rates[] = { 8000, 16000, 32000, 48000 }; static struct snd_pcm_hw_constraint_list imx_wm8960_rate_constraints = { .count = ARRAY_SIZE(imx_wm8960_rates), .list = imx_wm8960_rates, }; -static u32 imx_wm8960_formats[] = {16, 32}; -static struct snd_pcm_hw_constraint_list imx_wm8960_format_constraints = { - .count = ARRAY_SIZE(imx_wm8960_formats), - .list = imx_wm8960_formats, -}; - static int imx_hifi_startup(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; @@ -415,11 +407,6 @@ static int imx_hifi_startup(struct snd_pcm_substream *substream) SNDRV_PCM_HW_PARAM_RATE, &imx_wm8960_rate_constraints); if (ret) return ret; - - ret = snd_pcm_hw_constraint_list(substream->runtime, 0, - SNDRV_PCM_HW_PARAM_SAMPLE_BITS, &imx_wm8960_format_constraints); - if (ret) - return ret; } ret = clk_prepare_enable(data->codec_clk); |