| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame] | 1 | From 0e4fe4adfd9a9cd36220b79a8eecce4d24a9fd02 Mon Sep 17 00:00:00 2001 |
| 2 | From: Dong Aisheng <aisheng.dong@nxp.com> |
| 3 | Date: Tue, 7 May 2019 11:01:08 +0800 |
| 4 | Subject: [PATCH] ASoC: fsl: sai: fix build failture due to 5.1 RC7 upgrade |
| 5 | |
| 6 | Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com> |
| 7 | --- |
| 8 | sound/soc/fsl/fsl_sai.c | 10 ---------- |
| 9 | 1 file changed, 10 deletions(-) |
| 10 | |
| 11 | --- a/sound/soc/fsl/fsl_sai.c |
| 12 | +++ b/sound/soc/fsl/fsl_sai.c |
| 13 | @@ -418,14 +418,12 @@ static int fsl_sai_set_dai_fmt_tr(struct |
| 14 | case SND_SOC_DAIFMT_CBS_CFS: |
| 15 | val_cr2 |= FSL_SAI_CR2_BCD_MSTR; |
| 16 | val_cr4 |= FSL_SAI_CR4_FSD_MSTR; |
| 17 | - sai->is_slave_mode = false; |
| 18 | break; |
| 19 | case SND_SOC_DAIFMT_CBM_CFM: |
| 20 | sai->slave_mode[tx] = true; |
| 21 | break; |
| 22 | case SND_SOC_DAIFMT_CBS_CFM: |
| 23 | val_cr2 |= FSL_SAI_CR2_BCD_MSTR; |
| 24 | - sai->is_slave_mode = false; |
| 25 | break; |
| 26 | case SND_SOC_DAIFMT_CBM_CFS: |
| 27 | val_cr4 |= FSL_SAI_CR4_FSD_MSTR; |
| 28 | @@ -1575,14 +1573,6 @@ static int fsl_sai_remove(struct platfor |
| 29 | return 0; |
| 30 | } |
| 31 | |
| 32 | -static const struct of_device_id fsl_sai_ids[] = { |
| 33 | - { .compatible = "fsl,vf610-sai", }, |
| 34 | - { .compatible = "fsl,imx6sx-sai", }, |
| 35 | - { .compatible = "fsl,imx6ul-sai", }, |
| 36 | - { /* sentinel */ } |
| 37 | -}; |
| 38 | -MODULE_DEVICE_TABLE(of, fsl_sai_ids); |
| 39 | - |
| 40 | #ifdef CONFIG_PM |
| 41 | static int fsl_sai_runtime_suspend(struct device *dev) |
| 42 | { |