aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/801-audio-0062-ASoC-fsl-sai-fix-build-failture-due-to-5.1-RC7-upgra.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/layerscape/patches-5.4/801-audio-0062-ASoC-fsl-sai-fix-build-failture-due-to-5.1-RC7-upgra.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/801-audio-0062-ASoC-fsl-sai-fix-build-failture-due-to-5.1-RC7-upgra.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/801-audio-0062-ASoC-fsl-sai-fix-build-failture-due-to-5.1-RC7-upgra.patch b/target/linux/layerscape/patches-5.4/801-audio-0062-ASoC-fsl-sai-fix-build-failture-due-to-5.1-RC7-upgra.patch
new file mode 100644
index 0000000000..7cce9d45a0
--- /dev/null
+++ b/target/linux/layerscape/patches-5.4/801-audio-0062-ASoC-fsl-sai-fix-build-failture-due-to-5.1-RC7-upgra.patch
@@ -0,0 +1,42 @@
+From 0e4fe4adfd9a9cd36220b79a8eecce4d24a9fd02 Mon Sep 17 00:00:00 2001
+From: Dong Aisheng <aisheng.dong@nxp.com>
+Date: Tue, 7 May 2019 11:01:08 +0800
+Subject: [PATCH] ASoC: fsl: sai: fix build failture due to 5.1 RC7 upgrade
+
+Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
+---
+ sound/soc/fsl/fsl_sai.c | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+--- a/sound/soc/fsl/fsl_sai.c
++++ b/sound/soc/fsl/fsl_sai.c
+@@ -418,14 +418,12 @@ static int fsl_sai_set_dai_fmt_tr(struct
+ case SND_SOC_DAIFMT_CBS_CFS:
+ val_cr2 |= FSL_SAI_CR2_BCD_MSTR;
+ val_cr4 |= FSL_SAI_CR4_FSD_MSTR;
+- sai->is_slave_mode = false;
+ break;
+ case SND_SOC_DAIFMT_CBM_CFM:
+ sai->slave_mode[tx] = true;
+ break;
+ case SND_SOC_DAIFMT_CBS_CFM:
+ val_cr2 |= FSL_SAI_CR2_BCD_MSTR;
+- sai->is_slave_mode = false;
+ break;
+ case SND_SOC_DAIFMT_CBM_CFS:
+ val_cr4 |= FSL_SAI_CR4_FSD_MSTR;
+@@ -1574,14 +1572,6 @@ static int fsl_sai_remove(struct platfor
+ return 0;
+ }
+
+-static const struct of_device_id fsl_sai_ids[] = {
+- { .compatible = "fsl,vf610-sai", },
+- { .compatible = "fsl,imx6sx-sai", },
+- { .compatible = "fsl,imx6ul-sai", },
+- { /* sentinel */ }
+-};
+-MODULE_DEVICE_TABLE(of, fsl_sai_ids);
+-
+ #ifdef CONFIG_PM
+ static int fsl_sai_runtime_suspend(struct device *dev)
+ {