Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
ASoC: fix params_rate() macro use in several codecs
Sevelar ASoC codec drivers wrongly assume, that the params_rate() macro
returns one of SNDRV_PCM_RATE_* defines instead of the actual numerical
sampling rate. Fix them.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
authored by Guennadi Liakhovetski and committed by Mark Brown b3172f22 18f98ab5
+7
-7
sound/soc/codecs/wm8510.c
+7
-7
sound/soc/codecs/wm8510.c
···
424
425
/* filter coefficient */
426
switch (params_rate(params)) {
427
-
case SNDRV_PCM_RATE_8000:
428
adn |= 0x5 << 1;
429
break;
430
-
case SNDRV_PCM_RATE_11025:
431
adn |= 0x4 << 1;
432
break;
433
-
case SNDRV_PCM_RATE_16000:
434
adn |= 0x3 << 1;
435
break;
436
-
case SNDRV_PCM_RATE_22050:
437
adn |= 0x2 << 1;
438
break;
439
-
case SNDRV_PCM_RATE_32000:
440
adn |= 0x1 << 1;
441
break;
442
-
case SNDRV_PCM_RATE_44100:
443
-
case SNDRV_PCM_RATE_48000:
444
break;
445
}
446
···
424
425
/* filter coefficient */
426
switch (params_rate(params)) {
427
+
case 8000:
428
adn |= 0x5 << 1;
429
break;
430
+
case 11025:
431
adn |= 0x4 << 1;
432
break;
433
+
case 16000:
434
adn |= 0x3 << 1;
435
break;
436
+
case 22050:
437
adn |= 0x2 << 1;
438
break;
439
+
case 32000:
440
adn |= 0x1 << 1;
441
break;
442
+
case 44100:
443
+
case 48000:
444
break;
445
}
446
+7
-7
sound/soc/codecs/wm8940.c
+7
-7
sound/soc/codecs/wm8940.c
···
378
iface |= (1 << 9);
379
380
switch (params_rate(params)) {
381
-
case SNDRV_PCM_RATE_8000:
382
addcntrl |= (0x5 << 1);
383
break;
384
-
case SNDRV_PCM_RATE_11025:
385
addcntrl |= (0x4 << 1);
386
break;
387
-
case SNDRV_PCM_RATE_16000:
388
addcntrl |= (0x3 << 1);
389
break;
390
-
case SNDRV_PCM_RATE_22050:
391
addcntrl |= (0x2 << 1);
392
break;
393
-
case SNDRV_PCM_RATE_32000:
394
addcntrl |= (0x1 << 1);
395
break;
396
-
case SNDRV_PCM_RATE_44100:
397
-
case SNDRV_PCM_RATE_48000:
398
break;
399
}
400
ret = snd_soc_write(codec, WM8940_ADDCNTRL, addcntrl);
···
378
iface |= (1 << 9);
379
380
switch (params_rate(params)) {
381
+
case 8000:
382
addcntrl |= (0x5 << 1);
383
break;
384
+
case 11025:
385
addcntrl |= (0x4 << 1);
386
break;
387
+
case 16000:
388
addcntrl |= (0x3 << 1);
389
break;
390
+
case 22050:
391
addcntrl |= (0x2 << 1);
392
break;
393
+
case 32000:
394
addcntrl |= (0x1 << 1);
395
break;
396
+
case 44100:
397
+
case 48000:
398
break;
399
}
400
ret = snd_soc_write(codec, WM8940_ADDCNTRL, addcntrl);
+7
-7
sound/soc/codecs/wm8974.c
+7
-7
sound/soc/codecs/wm8974.c
···
482
483
/* filter coefficient */
484
switch (params_rate(params)) {
485
-
case SNDRV_PCM_RATE_8000:
486
adn |= 0x5 << 1;
487
break;
488
-
case SNDRV_PCM_RATE_11025:
489
adn |= 0x4 << 1;
490
break;
491
-
case SNDRV_PCM_RATE_16000:
492
adn |= 0x3 << 1;
493
break;
494
-
case SNDRV_PCM_RATE_22050:
495
adn |= 0x2 << 1;
496
break;
497
-
case SNDRV_PCM_RATE_32000:
498
adn |= 0x1 << 1;
499
break;
500
-
case SNDRV_PCM_RATE_44100:
501
-
case SNDRV_PCM_RATE_48000:
502
break;
503
}
504
···
482
483
/* filter coefficient */
484
switch (params_rate(params)) {
485
+
case 8000:
486
adn |= 0x5 << 1;
487
break;
488
+
case 11025:
489
adn |= 0x4 << 1;
490
break;
491
+
case 16000:
492
adn |= 0x3 << 1;
493
break;
494
+
case 22050:
495
adn |= 0x2 << 1;
496
break;
497
+
case 32000:
498
adn |= 0x1 << 1;
499
break;
500
+
case 44100:
501
+
case 48000:
502
break;
503
}
504