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

   1 From a115bf34468398647e7a8f380058bd597e44e1b3 Mon Sep 17 00:00:00 2001
   2 From: Viorel Suman <viorel.suman@nxp.com>
   3 Date: Mon, 29 Jan 2018 16:04:44 +0200
   4 Subject: [PATCH] MLK-16224-6: ASoC: fsl_sai: fix DSD suspend/resume
   5
   6 With the existing implementation the SAI pinctrl state is restored to
   7 default after resume - this breaks DSD playback after resume.
   8 Restore DSD pinctrl state in snd_soc_dai_driver resume callback.
   9
  10 Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
  11 Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
  12 ---
  13  sound/soc/fsl/fsl_sai.c | 18 ++++++++++++++++++
  14  1 file changed, 18 insertions(+)
  15
  16 --- a/sound/soc/fsl/fsl_sai.c
  17 +++ b/sound/soc/fsl/fsl_sai.c
  18 @@ -893,6 +893,23 @@ static int fsl_sai_dai_probe(struct snd_
  19         return 0;
  20  }
  21
  22 +static int fsl_sai_dai_resume(struct snd_soc_dai *cpu_dai)
  23 +{
  24 +       struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
  25 +       int ret;
  26 +
  27 +       if (sai->is_dsd && !IS_ERR_OR_NULL(sai->pins_dsd)) {
  28 +               ret = pinctrl_select_state(sai->pinctrl, sai->pins_dsd);
  29 +               if (ret) {
  30 +                       dev_err(cpu_dai->dev,
  31 +                               "failed to set proper pins state: %d\n", ret);
  32 +                       return ret;
  33 +               }
  34 +       }
  35 +
  36 +       return 0;
  37 +}
  38 +
  39  static struct snd_soc_dai_driver fsl_sai_dai = {
  40         .probe = fsl_sai_dai_probe,
  41         .playback = {
  42 @@ -913,6 +930,7 @@ static struct snd_soc_dai_driver fsl_sai
  43                 .rates = SNDRV_PCM_RATE_KNOT,
  44                 .formats = FSL_SAI_FORMATS,
  45         },
  46 +       .resume  = fsl_sai_dai_resume,
  47         .ops = &fsl_sai_pcm_dai_ops,
  48  };
  49