summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/max98373.c
diff options
context:
space:
mode:
authorTakashi Iwai2019-08-06 12:28:08 +0200
committerTakashi Iwai2019-08-06 12:28:08 +0200
commitc2913b140f901a705809f8b6c83998cf8147f848 (patch)
tree53686878548921b83e8d9db437c4437140561980 /sound/soc/codecs/max98373.c
parentALSA: usb-audio: Fix gpf in snd_usb_pipe_sanity_check (diff)
parentASoC: amd: acp3x: use dma address for acp3x dma driver (diff)
downloadkernel-qcow2-linux-c2913b140f901a705809f8b6c83998cf8147f848.tar.gz
kernel-qcow2-linux-c2913b140f901a705809f8b6c83998cf8147f848.tar.xz
kernel-qcow2-linux-c2913b140f901a705809f8b6c83998cf8147f848.zip
Merge tag 'asoc-fix-v5.3-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.3 A relatively large batch of mostly unremarkable fixes here, a couple of small core fixes for fairly obscure issues, more comment/email updates with no code impact than usual and a bunch of small driver fixes. The support for new sample rates in the max98373 driver is a fix for the fact that the driver declared support for those rates but would in fact return an error if these rates were selected.
Diffstat (limited to 'sound/soc/codecs/max98373.c')
-rwxr-xr-x[-rw-r--r--]sound/soc/codecs/max98373.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/codecs/max98373.c b/sound/soc/codecs/max98373.c
index 528695cd6a1c..8c601a3ebc27 100644..100755
--- a/sound/soc/codecs/max98373.c
+++ b/sound/soc/codecs/max98373.c
@@ -267,6 +267,12 @@ static int max98373_dai_hw_params(struct snd_pcm_substream *substream,
case 48000:
sampling_rate = MAX98373_PCM_SR_SET1_SR_48000;
break;
+ case 88200:
+ sampling_rate = MAX98373_PCM_SR_SET1_SR_88200;
+ break;
+ case 96000:
+ sampling_rate = MAX98373_PCM_SR_SET1_SR_96000;
+ break;
default:
dev_err(component->dev, "rate %d not supported\n",
params_rate(params));