diff options
| author | Dong Aisheng <aisheng.dong@nxp.com> | 2019-07-31 17:11:39 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-11-25 15:53:34 +0800 |
| commit | a7e3a722ede6f28b4307dbe3c1a77c7662fb02a9 (patch) | |
| tree | 3713583e6f0bac50786d59ecae7f4af43296f74d /sound/soc/fsl | |
| parent | 252b2a0d9ece09f654f0f9ec071f1916901c63e4 (diff) | |
Revert "ASoC: fsl_sai: add of_match data"
This reverts commit 89c9679f699d88986ce552738dc7c5c500c8fc67.
Diffstat (limited to 'sound/soc/fsl')
| -rw-r--r-- | sound/soc/fsl/fsl_sai.c | 22 | ||||
| -rw-r--r-- | sound/soc/fsl/fsl_sai.h | 6 |
2 files changed, 9 insertions, 19 deletions
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index ed0432e7327a..d58cc3ae90d8 100644 --- 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_device *pdev) 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_device *pdev) if (ret) return ret; - if (sai->soc_data->use_imx_pcm) + if (sai->sai_on_imx) return imx_pcm_dma_init(pdev, IMX_SAI_DMABUF_SIZE); else return devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); @@ -911,18 +913,10 @@ static int fsl_sai_remove(struct platform_device *pdev) 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); diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h index 83e2bfe05b1b..24cb156bf995 100644 --- 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; }; |