git.openwrt.org Git - openwrt/staging/981213.git/blob

   1 From f303194bc24925d3efd965ccfae40974ea437240 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?J=C3=B6rg=20Schambacher?=
   3  <j-schambacher@users.noreply.github.com>
   4 Date: Wed, 15 Apr 2020 11:48:29 +0200
   5 Subject: [PATCH] Fixes a problem with clock settings of HiFiBerry
   6  DAC+ADC PRO (#3545)
   7
   8 This patch fixes a problem of the re-calculation of
   9 i2s-clock and -parameter settings when only the ADC is activated.
  10
  11 Signed-off-by: Joerg Schambacher <joerg@i2audio.com>
  12 ---
  13  sound/soc/bcm/hifiberry_dacplusadcpro.c | 9 ++++++++-
  14  1 file changed, 8 insertions(+), 1 deletion(-)
  15
  16 --- a/sound/soc/bcm/hifiberry_dacplusadcpro.c
  17 +++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c
  18 @@ -390,9 +390,11 @@ static int snd_rpi_hifiberry_dacplusadcp
  19         int channels = params_channels(params);
  20         int width = 32;
  21         struct snd_soc_component *dac = rtd->codec_dais[0]->component;
  22 +       struct snd_soc_dai *dai = rtd->codec_dais[0];
  23 +       struct snd_soc_dai_driver *drv = dai->driver;
  24 +       const struct snd_soc_dai_ops *ops = drv->ops;
  25
  26         if (snd_rpi_hifiberry_is_dacpro) {
  27 -
  28                 width = snd_pcm_format_physical_width(params_format(params));
  29
  30                 snd_rpi_hifiberry_dacplusadcpro_set_sclk(dac,
  31 @@ -414,6 +416,11 @@ static int snd_rpi_hifiberry_dacplusadcp
  32                 return ret;
  33         ret = snd_soc_dai_set_tdm_slot(rtd->codec_dais[1], 0x03, 0x03,
  34                 channels, width);
  35 +       if (ret)
  36 +               return ret;
  37 +
  38 +       if (snd_rpi_hifiberry_is_dacpro && ops->hw_params)
  39 +                       ret = ops->hw_params(substream, params, dai);
  40         return ret;
  41  }
  42