diff options
author | Yangbo Lu <yangbo.lu@nxp.com> | 2020-04-10 10:47:05 +0800 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2020-05-07 12:53:06 +0200 |
commit | cddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch) | |
tree | 392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/801-audio-0011-Revert-ASoC-fsl_sai-add-of_match-data.patch | |
parent | d1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff) | |
download | upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2 upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip |
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 <yangbo.lu@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/801-audio-0011-Revert-ASoC-fsl_sai-add-of_match-data.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/801-audio-0011-Revert-ASoC-fsl_sai-add-of_match-data.patch | 96 |
1 files changed, 96 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/801-audio-0011-Revert-ASoC-fsl_sai-add-of_match-data.patch b/target/linux/layerscape/patches-5.4/801-audio-0011-Revert-ASoC-fsl_sai-add-of_match-data.patch new file mode 100644 index 0000000000..465c3314d9 --- /dev/null +++ b/target/linux/layerscape/patches-5.4/801-audio-0011-Revert-ASoC-fsl_sai-add-of_match-data.patch @@ -0,0 +1,96 @@ +From 6e0abca40338d5078be0e5947c7f9723b40bc7e7 Mon Sep 17 00:00:00 2001 +From: Dong Aisheng <aisheng.dong@nxp.com> +Date: Mon, 30 Mar 2020 16:17:52 +0800 +Subject: [PATCH] Revert "ASoC: fsl_sai: add of_match data" + +This reverts commit 89c9679f699d88986ce552738dc7c5c500c8fc67. + +[rebase] +Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> +--- + sound/soc/fsl/fsl_sai.c | 22 ++++++++-------------- + sound/soc/fsl/fsl_sai.h | 6 +----- + 2 files changed, 9 insertions(+), 19 deletions(-) + +--- a/sound/soc/fsl/fsl_sai.c ++++ b/sound/soc/fsl/fsl_sai.c +@@ -9,7 +9,6 @@ + #include <linux/dmaengine.h> + #include <linux/module.h> + #include <linux/of_address.h> +-#include <linux/of_device.h> + #include <linux/pm_runtime.h> + #include <linux/regmap.h> + #include <linux/slab.h> +@@ -789,7 +788,10 @@ static int fsl_sai_probe(struct platform + return -ENOMEM; + + sai->pdev = pdev; +- sai->soc_data = of_device_get_match_data(&pdev->dev); ++ ++ if (of_device_is_compatible(np, "fsl,imx6sx-sai") || ++ of_device_is_compatible(np, "fsl,imx6ul-sai")) ++ sai->sai_on_imx = true; + + sai->is_lsb_first = of_property_read_bool(np, "lsb-first"); + +@@ -898,7 +900,7 @@ static int fsl_sai_probe(struct platform + if (ret) + goto err_pm_disable; + +- if (sai->soc_data->use_imx_pcm) { ++ if (sai->sai_on_imx) + ret = imx_pcm_dma_init(pdev, IMX_SAI_DMABUF_SIZE); + if (ret) + goto err_pm_disable; +@@ -923,18 +925,10 @@ static int fsl_sai_remove(struct platfor + return 0; + } + +-static const struct fsl_sai_soc_data fsl_sai_vf610_data = { +- .use_imx_pcm = false, +-}; +- +-static const struct fsl_sai_soc_data fsl_sai_imx6sx_data = { +- .use_imx_pcm = true, +-}; +- + static const struct of_device_id fsl_sai_ids[] = { +- { .compatible = "fsl,vf610-sai", .data = &fsl_sai_vf610_data }, +- { .compatible = "fsl,imx6sx-sai", .data = &fsl_sai_imx6sx_data }, +- { .compatible = "fsl,imx6ul-sai", .data = &fsl_sai_imx6sx_data }, ++ { .compatible = "fsl,vf610-sai", }, ++ { .compatible = "fsl,imx6sx-sai", }, ++ { .compatible = "fsl,imx6ul-sai", }, + { /* sentinel */ } + }; + MODULE_DEVICE_TABLE(of, fsl_sai_ids); +--- a/sound/soc/fsl/fsl_sai.h ++++ b/sound/soc/fsl/fsl_sai.h +@@ -126,10 +126,6 @@ + #define FSL_SAI_MAXBURST_TX 6 + #define FSL_SAI_MAXBURST_RX 6 + +-struct fsl_sai_soc_data { +- bool use_imx_pcm; +-}; +- + struct fsl_sai { + struct platform_device *pdev; + struct regmap *regmap; +@@ -139,6 +135,7 @@ struct fsl_sai { + bool is_slave_mode; + bool is_lsb_first; + bool is_dsp_mode; ++ bool sai_on_imx; + bool synchronous[2]; + + unsigned int mclk_id[2]; +@@ -146,7 +143,6 @@ struct fsl_sai { + unsigned int slots; + unsigned int slot_width; + +- const struct fsl_sai_soc_data *soc_data; + struct snd_dmaengine_dai_dma_data dma_params_rx; + struct snd_dmaengine_dai_dma_data dma_params_tx; + }; |