No sound captured with SGTL5000 on i.MX6 in I²S master mode

Commit Message

Michael Nazzareno Trimarchi Sept. 18, 2014, 6:03 p.m. UTC

Hi

On Thu, Sep 18, 2014 at 10:45:27AM -0700, Nicolin Chen wrote:
> On Thu, Sep 18, 2014 at 07:26:11PM +0200, Michael Trimarchi wrote:
> > bug was reported by Jean-Michel. I don't know if it works because I can not
> > test but seems ok. Do we need this _set_dai_fmt in probe function?
> 
> I think yes. The AC97 part might need this _set_dai_fmt call in the
> probe().
> 
> > code is a bit broken just because panic on probe path if pdev is null
> > [...]
> > 	/*
> > 	 * If codec-handle property is missing from SSI node, we assume
> > 	 * that the machine driver uses new binding which does not require
> > 	 * SSI driver to trigger machine driver's probe.
> > 	 */
> > 	if (!of_get_property(np, "codec-handle", NULL))
> > 		goto done;
> > [...]
> > 	ssi_private->pdev =
> > 		platform_device_register_data(&pdev->dev, name, 0, NULL, 0);
> > [...]
> > done:
> > 	if (ssi_private->dai_fmt)
> > 		_fsl_ssi_set_dai_fmt(ssi_private, ssi_private->dai_fmt);
> > 
> > 
> > diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
> > index 87eb577..f63bc02 100644
> > --- a/sound/soc/fsl/fsl_ssi.c
> > +++ b/sound/soc/fsl/fsl_ssi.c
> > @@ -758,7 +758,8 @@ static int _fsl_ssi_set_dai_fmt(struct fsl_ssi_private *ssi_private,
> >  	ssi_private->dai_fmt = fmt;
> >  
> >  	if (fsl_ssi_is_i2s_master(ssi_private) && IS_ERR(ssi_private->baudclk)) {
> > -		dev_err(&ssi_private->pdev->dev, "baudclk is missing which is necessary for master mode\n");
> > +		pr_err("baudclk is missing which is necessary"
> > +			" for master mode\n");
> 
> Ah, this is a problem. We should not use ssi_private->pdev->dev here.
> I think it'll be better if adding a new parameter of *dev pointer to
> this _set_dai_fmt() -- passing pdev->dev in probe() and cpu_dai->dev
> in fsl_ssi_set_dai_fmt().
> 

Somenthing like this?

> Nicolin

Comments

Nicolin Chen Sept. 18, 2014, 6:13 p.m. UTC | #1

On Thu, Sep 18, 2014 at 08:03:31PM +0200, Michael Trimarchi wrote:
> > Ah, this is a problem. We should not use ssi_private->pdev->dev here.
> > I think it'll be better if adding a new parameter of *dev pointer to
> > this _set_dai_fmt() -- passing pdev->dev in probe() and cpu_dai->dev
> > in fsl_ssi_set_dai_fmt().
> > 
> 
> Somenthing like this?

Yes, would you like to send a separate patch? I think other people
and maintainers'd like to take a look at it and decide if it's a
good shoot. I'll also take a further look at it after I finish my
laundry :)

Thank you
Nicolin

> 
> diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
> index 87eb577..de6ab06 100644
> --- a/sound/soc/fsl/fsl_ssi.c
> +++ b/sound/soc/fsl/fsl_ssi.c
> @@ -748,8 +748,9 @@ static int fsl_ssi_hw_free(struct snd_pcm_substream *substream,
>  	return 0;
>  }
>  
> -static int _fsl_ssi_set_dai_fmt(struct fsl_ssi_private *ssi_private,
> -		unsigned int fmt)
> +static int _fsl_ssi_set_dai_fmt(struct device *dev,
> +				struct fsl_ssi_private *ssi_private,
> +				unsigned int fmt)
>  {
>  	struct regmap *regs = ssi_private->regs;
>  	u32 strcr = 0, stcr, srcr, scr, mask;
> @@ -758,7 +759,7 @@ static int _fsl_ssi_set_dai_fmt(struct fsl_ssi_private *ssi_private,
>  	ssi_private->dai_fmt = fmt;
>  
>  	if (fsl_ssi_is_i2s_master(ssi_private) && IS_ERR(ssi_private->baudclk)) {
> -		dev_err(&ssi_private->pdev->dev, "baudclk is missing which is necessary for master mode\n");
> +		dev_err(dev, "baudclk is missing which is necessary for master mode\n");
>  		return -EINVAL;
>  	}
>  
> @@ -913,7 +914,7 @@ static int fsl_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
>  {
>  	struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(cpu_dai);
>  
> -	return _fsl_ssi_set_dai_fmt(ssi_private, fmt);
> +	return _fsl_ssi_set_dai_fmt(cpu_dai->dev, ssi_private, fmt);
>  }
>  
>  /**
> @@ -1387,7 +1388,8 @@ static int fsl_ssi_probe(struct platform_device *pdev)
>  
>  done:
>  	if (ssi_private->dai_fmt)
> -		_fsl_ssi_set_dai_fmt(ssi_private, ssi_private->dai_fmt);
> +		_fsl_ssi_set_dai_fmt(&pdev->dev, ssi_private,
> +				     ssi_private->dai_fmt);
>  
>  	return 0;
>  
> > Nicolin
> 
> -- 
> | Michael Nazzareno Trimarchi                     Amarula Solutions BV |
> | COO  -  Founder                                      Cruquiuskade 47 |
> | [phone]                                 Amsterdam 1018 AM NL |
> |                  [`as] http://www.amarulasolutions.com               |

Michael Nazzareno Trimarchi Sept. 18, 2014, 6:18 p.m. UTC | #2

Hi Fabio

On Thu, Sep 18, 2014 at 8:13 PM, Nicolin Chen <[e-mail]> wrote:
> On Thu, Sep 18, 2014 at 08:03:31PM +0200, Michael Trimarchi wrote:
>> > Ah, this is a problem. We should not use ssi_private->pdev->dev here.
>> > I think it'll be better if adding a new parameter of *dev pointer to
>> > this _set_dai_fmt() -- passing pdev->dev in probe() and cpu_dai->dev
>> > in fsl_ssi_set_dai_fmt().
>> >
>>
>> Somenthing like this?
>
> Yes, would you like to send a separate patch? I think other people
> and maintainers'd like to take a look at it and decide if it's a
> good shoot. I'll also take a further look at it after I finish my
> laundry :)
>

Yes sure

Michael


> Thank you
> Nicolin
>
>>
>> diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
>> index 87eb577..de6ab06 100644
>> --- a/sound/soc/fsl/fsl_ssi.c
>> +++ b/sound/soc/fsl/fsl_ssi.c
>> @@ -748,8 +748,9 @@ static int fsl_ssi_hw_free(struct snd_pcm_substream *substream,
>>       return 0;
>>  }
>>
>> -static int _fsl_ssi_set_dai_fmt(struct fsl_ssi_private *ssi_private,
>> -             unsigned int fmt)
>> +static int _fsl_ssi_set_dai_fmt(struct device *dev,
>> +                             struct fsl_ssi_private *ssi_private,
>> +                             unsigned int fmt)
>>  {
>>       struct regmap *regs = ssi_private->regs;
>>       u32 strcr = 0, stcr, srcr, scr, mask;
>> @@ -758,7 +759,7 @@ static int _fsl_ssi_set_dai_fmt(struct fsl_ssi_private *ssi_private,
>>       ssi_private->dai_fmt = fmt;
>>
>>       if (fsl_ssi_is_i2s_master(ssi_private) && IS_ERR(ssi_private->baudclk)) {
>> -             dev_err(&ssi_private->pdev->dev, "baudclk is missing which is necessary for master mode\n");
>> +             dev_err(dev, "baudclk is missing which is necessary for master mode\n");
>>               return -EINVAL;
>>       }
>>
>> @@ -913,7 +914,7 @@ static int fsl_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
>>  {
>>       struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(cpu_dai);
>>
>> -     return _fsl_ssi_set_dai_fmt(ssi_private, fmt);
>> +     return _fsl_ssi_set_dai_fmt(cpu_dai->dev, ssi_private, fmt);
>>  }
>>
>>  /**
>> @@ -1387,7 +1388,8 @@ static int fsl_ssi_probe(struct platform_device *pdev)
>>
>>  done:
>>       if (ssi_private->dai_fmt)
>> -             _fsl_ssi_set_dai_fmt(ssi_private, ssi_private->dai_fmt);
>> +             _fsl_ssi_set_dai_fmt(&pdev->dev, ssi_private,
>> +                                  ssi_private->dai_fmt);
>>
>>       return 0;
>>
>> > Nicolin
>>
>> --
>> | Michael Nazzareno Trimarchi                     Amarula Solutions BV |
>> | COO  -  Founder                                      Cruquiuskade 47 |
>> | [phone]                                 Amsterdam 1018 AM NL |
>> |                  [`as] http://www.amarulasolutions.com               |

Patch

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 87eb577..de6ab06 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -748,8 +748,9 @@  static int fsl_ssi_hw_free(struct snd_pcm_substream *substream,
 	return 0;
 }
 
-static int _fsl_ssi_set_dai_fmt(struct fsl_ssi_private *ssi_private,
-		unsigned int fmt)
+static int _fsl_ssi_set_dai_fmt(struct device *dev,
+				struct fsl_ssi_private *ssi_private,
+				unsigned int fmt)
 {
 	struct regmap *regs = ssi_private->regs;
 	u32 strcr = 0, stcr, srcr, scr, mask;
@@ -758,7 +759,7 @@  static int _fsl_ssi_set_dai_fmt(struct fsl_ssi_private *ssi_private,
 	ssi_private->dai_fmt = fmt;
 
 	if (fsl_ssi_is_i2s_master(ssi_private) && IS_ERR(ssi_private->baudclk)) {
-		dev_err(&ssi_private->pdev->dev, "baudclk is missing which is necessary for master mode\n");
+		dev_err(dev, "baudclk is missing which is necessary for master mode\n");
 		return -EINVAL;
 	}
 
@@ -913,7 +914,7 @@  static int fsl_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
 {
 	struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(cpu_dai);
 
-	return _fsl_ssi_set_dai_fmt(ssi_private, fmt);
+	return _fsl_ssi_set_dai_fmt(cpu_dai->dev, ssi_private, fmt);
 }
 
 /**
@@ -1387,7 +1388,8 @@  static int fsl_ssi_probe(struct platform_device *pdev)
 
 done:
 	if (ssi_private->dai_fmt)
-		_fsl_ssi_set_dai_fmt(ssi_private, ssi_private->dai_fmt);
+		_fsl_ssi_set_dai_fmt(&pdev->dev, ssi_private,
+				     ssi_private->dai_fmt);
 
 	return 0;