diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-09-24 20:48:01 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-09-24 20:48:01 +0200 |
| commit | 1ce3cbe2ab4074ca5196e74a45665a2cd87bbdb1 (patch) | |
| tree | 1a0bdcb031aa30ea05cbe4aa48d0ac6007b033a2 /sound/soc/codecs/wm8962.c | |
| parent | ALSA: hda/tegra - async probe for avoiding module loading deadlock (diff) | |
| parent | Merge remote-tracking branches 'asoc/fix/wm8960' and 'asoc/fix/wm8962' into a... (diff) | |
| download | linux-1ce3cbe2ab4074ca5196e74a45665a2cd87bbdb1.tar.xz linux-1ce3cbe2ab4074ca5196e74a45665a2cd87bbdb1.zip | |
Merge tag 'asoc-fix-v4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.3
A disappointingly large set of fixes, though none of them very big and
very widely spread over many different drivers. Nothing especially
stands out, it's mostly all device specific and relatively minor.
Diffstat (limited to 'sound/soc/codecs/wm8962.c')
| -rw-r--r-- | sound/soc/codecs/wm8962.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index b4eb975da981..293e47a6ff59 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -2944,7 +2944,8 @@ static int wm8962_mute(struct snd_soc_dai *dai, int mute) WM8962_DAC_MUTE, val); } -#define WM8962_RATES SNDRV_PCM_RATE_8000_96000 +#define WM8962_RATES (SNDRV_PCM_RATE_8000_48000 |\ + SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000) #define WM8962_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) |