| Message ID | ecfcedaa-f0e9-ec1f-82c5-f0d319068a5d@maciej.szmigiero.name (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 695b78b548d8a26288f041e907ff17758df9e1d5 |
| Headers | show |
On Mon, Nov 20, 2017 at 11:14:55PM +0100, Maciej S. Szmigiero wrote: > AC'97 ops (register read / write) need SSI regmap and clock, so they have > to be set after them. > > We also need to set these ops back to NULL if we fail the probe. > > Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name> Acked-by: Nicolin Chen <nicoleotsuka@gmail.com> > --- > sound/soc/fsl/fsl_ssi.c | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) > > diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c > index dad80b4b0cfc..a71bb8391f61 100644 > --- a/sound/soc/fsl/fsl_ssi.c > +++ b/sound/soc/fsl/fsl_ssi.c > @@ -1460,12 +1460,6 @@ static int fsl_ssi_probe(struct platform_device *pdev) > sizeof(fsl_ssi_ac97_dai)); > > fsl_ac97_data = ssi_private; By the way, is there any better way to register the ops for AC97 while we could pass the ssi_private so as to remove the global fsl_ac97_data?
On 21.11.2017 01:32, Nicolin Chen wrote: > On Mon, Nov 20, 2017 at 11:14:55PM +0100, Maciej S. Szmigiero wrote: (..) >> @@ -1460,12 +1460,6 @@ static int fsl_ssi_probe(struct platform_device *pdev) >> sizeof(fsl_ssi_ac97_dai)); >> >> fsl_ac97_data = ssi_private; > > By the way, is there any better way to register the ops for AC97 > while we could pass the ssi_private so as to remove the global > fsl_ac97_data? This might be possible (if SSI private data is provided to AC'97 codec in codecs/ac97.c in platform device data which then is modified to make use of it), but currently ASoC AC'97 only supports one controller per system so for a real gain this limitation would have to be addressed first. Maciej
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index dad80b4b0cfc..a71bb8391f61 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -1460,12 +1460,6 @@ static int fsl_ssi_probe(struct platform_device *pdev) sizeof(fsl_ssi_ac97_dai)); fsl_ac97_data = ssi_private; - - ret = snd_soc_set_ac97_ops_of_reset(&fsl_ssi_ac97_ops, pdev); - if (ret) { - dev_err(&pdev->dev, "could not set AC'97 ops\n"); - return ret; - } } else { /* Initialize this copy of the CPU DAI driver structure */ memcpy(&ssi_private->cpu_dai_drv, &fsl_ssi_dai_template, @@ -1576,6 +1570,14 @@ static int fsl_ssi_probe(struct platform_device *pdev) return ret; } + if (fsl_ssi_is_ac97(ssi_private)) { + ret = snd_soc_set_ac97_ops_of_reset(&fsl_ssi_ac97_ops, pdev); + if (ret) { + dev_err(&pdev->dev, "could not set AC'97 ops\n"); + goto error_ac97_ops; + } + } + ret = devm_snd_soc_register_component(&pdev->dev, &fsl_ssi_component, &ssi_private->cpu_dai_drv, 1); if (ret) { @@ -1659,6 +1661,10 @@ static int fsl_ssi_probe(struct platform_device *pdev) fsl_ssi_debugfs_remove(&ssi_private->dbg_stats); error_asoc_register: + if (fsl_ssi_is_ac97(ssi_private)) + snd_soc_set_ac97_ops(NULL); + +error_ac97_ops: if (ssi_private->soc->imx) fsl_ssi_imx_clean(pdev, ssi_private);
AC'97 ops (register read / write) need SSI regmap and clock, so they have to be set after them. We also need to set these ops back to NULL if we fail the probe. Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name> --- sound/soc/fsl/fsl_ssi.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)