target/linux/brcm2708/patches-4.14/950-0220-Revert-downstream-wm8804-changes.patch

   1 From 91fb8d2d0718c2de44623a300273f5144e1ebcab Mon Sep 17 00:00:00 2001
   2 From: Matthias Reichl <hias@horus.com>
   3 Date: Fri, 2 Feb 2018 12:00:00 +0100
   4 Subject: [PATCH 220/454] Revert downstream wm8804 changes
   5
   6 The format change from S24_LE to S24_3LE effectively disables 24-bit
   7 mode as S24_3LE isn't supported by bcm2835-i2s. This causes issues
   8 with drivers that want to use wm8804 in 24-bit mode.
   9
  10 Adding the S32_LE format is also incorrect, according to the datasheet
  11 only 16-24 bit formats are supported.
  12
  13 Signed-off-by: Matthias Reichl <hias@horus.com>
  14 ---
  15  sound/soc/codecs/wm8804.c | 5 ++---
  16  1 file changed, 2 insertions(+), 3 deletions(-)
  17
  18 --- a/sound/soc/codecs/wm8804.c
  19 +++ b/sound/soc/codecs/wm8804.c
  20 @@ -304,7 +304,6 @@ static int wm8804_hw_params(struct snd_p
  21                 blen = 0x1;
  22                 break;
  23         case 24:
  24 -       case 32:
  25                 blen = 0x2;
  26                 break;
  27         default:
  28 @@ -516,7 +515,7 @@ static const struct snd_soc_dai_ops wm88
  29  };
  30
  31  #define WM8804_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
  32 -                       SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE)
  33 +                       SNDRV_PCM_FMTBIT_S24_LE)
  34
  35  #define WM8804_RATES (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
  36                       SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_64000 | \
  37 @@ -544,7 +543,7 @@ static struct snd_soc_dai_driver wm8804_
  38  };
  39
  40  static const struct snd_soc_codec_driver soc_codec_dev_wm8804 = {
  41 -       .idle_bias_off = false,
  42 +       .idle_bias_off = true,
  43
  44         .component_driver = {
  45                 .dapm_widgets           = wm8804_dapm_widgets,