diff options
Diffstat (limited to 'target/linux/layerscape/patches-5.4/801-audio-0049-MLK-17580-ASoC-fsl-sai-check-for-pinctrl-status.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/801-audio-0049-MLK-17580-ASoC-fsl-sai-check-for-pinctrl-status.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/target/linux/layerscape/patches-5.4/801-audio-0049-MLK-17580-ASoC-fsl-sai-check-for-pinctrl-status.patch b/target/linux/layerscape/patches-5.4/801-audio-0049-MLK-17580-ASoC-fsl-sai-check-for-pinctrl-status.patch deleted file mode 100644 index f93bdfe63e..0000000000 --- a/target/linux/layerscape/patches-5.4/801-audio-0049-MLK-17580-ASoC-fsl-sai-check-for-pinctrl-status.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 12b887445779c33285dac5279fc02fd80e0800d8 Mon Sep 17 00:00:00 2001 -From: Viorel Suman <viorel.suman@nxp.com> -Date: Fri, 9 Mar 2018 12:41:42 +0200 -Subject: [PATCH] MLK-17580: ASoC: fsl: sai: check for pinctrl status - -For some cases (like AMIX) pinctrl may be null - this -breaks SAI functionality. Enforce pinctrl null pointer -checking prior calling any function which involves -pins state changes. - -Signed-off-by: Viorel Suman <viorel.suman@nxp.com> ---- - sound/soc/fsl/fsl_sai.c | 21 ++++++++++++--------- - 1 file changed, 12 insertions(+), 9 deletions(-) - ---- a/sound/soc/fsl/fsl_sai.c -+++ b/sound/soc/fsl/fsl_sai.c -@@ -530,14 +530,17 @@ static int fsl_sai_hw_params(struct snd_ - - pins = DIV_ROUND_UP(channels, slots); - sai->is_dsd = fsl_is_dsd(params); -- sai->pins_state = fsl_get_pins_state(sai->pinctrl, params); - -- 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; -+ if (!IS_ERR_OR_NULL(sai->pinctrl)) { -+ sai->pins_state = fsl_get_pins_state(sai->pinctrl, params); -+ -+ 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; -+ } - } - } - -@@ -920,7 +923,7 @@ static int fsl_sai_dai_resume(struct snd - struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai); - int ret; - -- if (!IS_ERR_OR_NULL(sai->pins_state)) { -+ if (!IS_ERR_OR_NULL(sai->pinctrl) && !IS_ERR_OR_NULL(sai->pins_state)) { - ret = pinctrl_select_state(sai->pinctrl, sai->pins_state); - if (ret) { - dev_err(cpu_dai->dev, -@@ -1346,7 +1349,7 @@ static int fsl_sai_probe(struct platform - sai->dma_params_rx.maxburst = FSL_SAI_MAXBURST_RX; - sai->dma_params_tx.maxburst = FSL_SAI_MAXBURST_TX; - -- sai->pinctrl = devm_pinctrl_get(&pdev->dev); -+ sai->pinctrl = devm_pinctrl_get(&pdev->dev); - - platform_set_drvdata(pdev, sai); - |