diff options
| author | Viorel Suman <viorel.suman@nxp.com> | 2018-03-08 14:43:34 +0200 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-11-25 15:53:58 +0800 |
| commit | 0e084ed83d0ce76f0a0ca087e2c790ab4e59d3c4 (patch) | |
| tree | d348685fc13ac910587fea637514a0f3ee1cacc8 /sound/soc/fsl/fsl_sai.c | |
| parent | 6e286195f62917d6e8655bf1520d6a0b01d1a4d4 (diff) | |
MLK-17580: ASoC: fsl: sai: Use DSD helper
Replace DSD related code with calls to DSD helper functions.
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com
Diffstat (limited to 'sound/soc/fsl/fsl_sai.c')
| -rw-r--r-- | sound/soc/fsl/fsl_sai.c | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index f284ee15be40..5c657bde67f2 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -22,6 +22,7 @@ #include <linux/mfd/syscon/imx6q-iomuxc-gpr.h> #include <linux/pm_runtime.h> +#include "fsl_dsd.h" #include "fsl_sai.h" #include "imx-pcm.h" @@ -523,31 +524,21 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream, int ret; int i; int trce_mask = 0; - snd_pcm_format_t format = params_format(params); if (sai->slots) slots = sai->slots; pins = DIV_ROUND_UP(channels, slots); + sai->is_dsd = fsl_is_dsd(params); + sai->pins_state = fsl_get_pins_state(sai->pinctrl, params); - if (format == SNDRV_PCM_FORMAT_DSD_U8 || - format == SNDRV_PCM_FORMAT_DSD_U16_LE || - format == SNDRV_PCM_FORMAT_DSD_U16_BE || - format == SNDRV_PCM_FORMAT_DSD_U32_LE || - format == SNDRV_PCM_FORMAT_DSD_U32_BE) { - sai->is_dsd = true; - - if (!IS_ERR_OR_NULL(sai->pins_dsd)) { - ret = pinctrl_select_state(sai->pinctrl, sai->pins_dsd); - if (ret) { - dev_err(cpu_dai->dev, - "failed to set proper pins state: %d\n", ret); - return ret; - } + if (!IS_ERR_OR_NULL(sai->pins_state)) { + ret = pinctrl_select_state(sai->pinctrl, sai->pins_state); + if (ret) { + dev_err(cpu_dai->dev, + "failed to set proper pins state: %d\n", ret); + return ret; } - } else { - pinctrl_pm_select_default_state(cpu_dai->dev); - sai->is_dsd = false; } if (sai->is_dsd) @@ -929,8 +920,8 @@ static int fsl_sai_dai_resume(struct snd_soc_dai *cpu_dai) struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai); int ret; - if (sai->is_dsd && !IS_ERR_OR_NULL(sai->pins_dsd)) { - ret = pinctrl_select_state(sai->pinctrl, sai->pins_dsd); + if (!IS_ERR_OR_NULL(sai->pins_state)) { + ret = pinctrl_select_state(sai->pinctrl, sai->pins_state); if (ret) { dev_err(cpu_dai->dev, "failed to set proper pins state: %d\n", ret); @@ -1356,9 +1347,6 @@ static int fsl_sai_probe(struct platform_device *pdev) sai->pinctrl = devm_pinctrl_get(&pdev->dev); - if (!IS_ERR_OR_NULL(sai->pinctrl)) - sai->pins_dsd = pinctrl_lookup_state(sai->pinctrl, "dsd"); - platform_set_drvdata(pdev, sai); pm_runtime_enable(&pdev->dev); |