diff options
| author | Shengjiu Wang <shengjiu.wang@nxp.com> | 2020-05-27 15:56:52 +0800 |
|---|---|---|
| committer | Shengjiu Wang <shengjiu.wang@nxp.com> | 2020-05-27 16:55:06 +0800 |
| commit | 2f07bac002aa9ac01d500f1f5c96d1bc73f95581 (patch) | |
| tree | 676f509b86091cc7024fd4aa21e364f3ca6e49a4 | |
| parent | 48daa0ca63cdac5efc95f606ad2daf66edfbd28f (diff) | |
MLK-24175: ASoC: fsl_sai: instantiate snd_soc_dai_driver
instantiate snd_soc_dai_driver for independent symmetric control.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Viorel Suman <viorel.suman@nxp.com>
| -rw-r--r-- | sound/soc/fsl/fsl_sai.c | 19 | ||||
| -rw-r--r-- | sound/soc/fsl/fsl_sai.h | 1 |
2 files changed, 12 insertions, 8 deletions
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index d3daa0239ec4..6508e2d2bf05 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -1028,7 +1028,7 @@ static int fsl_sai_dai_resume(struct snd_soc_dai *cpu_dai) return 0; } -static struct snd_soc_dai_driver fsl_sai_dai = { +static struct snd_soc_dai_driver fsl_sai_dai_template = { .probe = fsl_sai_dai_probe, .playback = { .stream_name = "CPU-Playback", @@ -1382,6 +1382,9 @@ static int fsl_sai_probe(struct platform_device *pdev) if (sai->soc->reg_offset == 8) fsl_sai_regmap_config = fsl_sai_v3_regmap_config; + memcpy(&sai->cpu_dai_drv, &fsl_sai_dai_template, + sizeof(fsl_sai_dai_template)); + sai->regmap = devm_regmap_init_mmio_clk(&pdev->dev, NULL, base, &fsl_sai_regmap_config); if (IS_ERR(sai->regmap)) { @@ -1467,9 +1470,9 @@ static int fsl_sai_probe(struct platform_device *pdev) /* Sync Tx with Rx as default by following old DT binding */ sai->synchronous[RX] = true; sai->synchronous[TX] = false; - fsl_sai_dai.symmetric_rates = 1; - fsl_sai_dai.symmetric_channels = 1; - fsl_sai_dai.symmetric_samplebits = 1; + sai->cpu_dai_drv.symmetric_rates = 1; + sai->cpu_dai_drv.symmetric_channels = 1; + sai->cpu_dai_drv.symmetric_samplebits = 1; if (of_find_property(np, "fsl,sai-synchronous-rx", NULL) && of_find_property(np, "fsl,sai-asynchronous", NULL)) { @@ -1486,9 +1489,9 @@ static int fsl_sai_probe(struct platform_device *pdev) /* Discard all settings for asynchronous mode */ sai->synchronous[RX] = false; sai->synchronous[TX] = false; - fsl_sai_dai.symmetric_rates = 0; - fsl_sai_dai.symmetric_channels = 0; - fsl_sai_dai.symmetric_samplebits = 0; + sai->cpu_dai_drv.symmetric_rates = 0; + sai->cpu_dai_drv.symmetric_channels = 0; + sai->cpu_dai_drv.symmetric_samplebits = 0; } platform_set_drvdata(pdev, sai); @@ -1554,7 +1557,7 @@ static int fsl_sai_probe(struct platform_device *pdev) regcache_cache_only(sai->regmap, true); ret = devm_snd_soc_register_component(&pdev->dev, &fsl_component, - &fsl_sai_dai, 1); + &sai->cpu_dai_drv, 1); if (ret) return ret; diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h index 81599924c38f..91e153e88ae2 100644 --- a/sound/soc/fsl/fsl_sai.h +++ b/sound/soc/fsl/fsl_sai.h @@ -288,6 +288,7 @@ struct fsl_sai { struct fsl_sai_verid verid; struct fsl_sai_param param; + struct snd_soc_dai_driver cpu_dai_drv; }; const struct attribute_group *fsl_sai_get_dev_attribute_group(bool monitor_spdif); |