From cddd4591404fb4c53dc0b3c0b15b942cdbed4356 Mon Sep 17 00:00:00 2001 From: Yangbo Lu Date: Fri, 10 Apr 2020 10:47:05 +0800 Subject: layerscape: add patches-5.4 Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu --- ...580-ASoC-fsl-sai-check-for-pinctrl-status.patch | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 target/linux/layerscape/patches-5.4/801-audio-0049-MLK-17580-ASoC-fsl-sai-check-for-pinctrl-status.patch (limited to 'target/linux/layerscape/patches-5.4/801-audio-0049-MLK-17580-ASoC-fsl-sai-check-for-pinctrl-status.patch') 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 new file mode 100644 index 0000000000..5f69c1daae --- /dev/null +++ b/target/linux/layerscape/patches-5.4/801-audio-0049-MLK-17580-ASoC-fsl-sai-check-for-pinctrl-status.patch @@ -0,0 +1,60 @@ +From 12b887445779c33285dac5279fc02fd80e0800d8 Mon Sep 17 00:00:00 2001 +From: Viorel Suman +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 +--- + 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, +@@ -1345,7 +1348,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); + -- cgit v1.2.3