[alsa-devel] [PATCH] ASoC: mxs: mxs-saif: Fix the playback/record capabilities

[Lars-Peter Clausen]

On 06/02/2013 06:38 PM, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam at freescale.com>
> 
> Running "aplay -l" and "arecord -l" results in the following outputs:
> 
> $ aplay -l
> **** List of PLAYBACK Hardware Devices ****
> card 0: mxssgtl5000 [mxs_sgtl5000], device 0: Playback sgtl5000-0 []
>   Subdevices: 1/1
>   Subdevice #0: subdevice #0
> card 0: mxssgtl5000 [mxs_sgtl5000], device 1: Capture sgtl5000-1 []
>   Subdevices: 1/1
>   Subdevice #0: subdevice #0
> 
> $ arecord -l
> **** List of CAPTURE Hardware Devices ****
> card 0: mxssgtl5000 [mxs_sgtl5000], device 0: Playback sgtl5000-0 []
>   Subdevices: 1/1
>   Subdevice #0: subdevice #0
> card 0: mxssgtl5000 [mxs_sgtl5000], device 1: Capture sgtl5000-1 []
>   Subdevices: 1/1
>   Subdevice #0: subdevice #0
> 
> On mx28 there are two serial audio interface ports (SAIF0 and SAIF1) and each
> one of them are unidirectional.
> 
> Create a mxs_saif_dai array containing a playback element and a record element
> only in order to properly describe the dai links.
> 
> After this change we can correctly report the capabilities as follows:
> 
> $ aplay -l                                                      
> **** List of PLAYBACK Hardware Devices ****                                     
> card 0: mxssgtl5000 [mxs_sgtl5000], device 0: HiFi Playback sgtl5000-0 []       
>   Subdevices: 1/1                                                               
>   Subdevice #0: subdevice #0                                                    
> 
> $ arecord -l                                                    
> **** List of CAPTURE Hardware Devices ****                                      
> card 0: mxssgtl5000 [mxs_sgtl5000], device 1: HiFi Capture sgtl5000-1 []        
>   Subdevices: 1/1                                                               
>   Subdevice #0: subdevice #0                                                    
> 
> Signed-off-by: Fabio Estevam <fabio.estevam at freescale.com>

Hi,

Not sure if this is the right approach, there is no limitation on either
saif0 or saif1 that it can only be used for capture or playback. Some
systems may use saif1 as playback and saif0 as capture, or both as playback
and so on...

- Lars

> ---
> This patch also needs:
> "[PATCH] ASoC: pcm: Require both CODEC and CPU support when declaring stream caps"
> from Mark Brown.
> 
>  sound/soc/mxs/mxs-saif.c | 38 ++++++++++++++++++++++----------------
>  1 file changed, 22 insertions(+), 16 deletions(-)
> 
> diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
> index 49d8700..7f3e67a 100644
> --- a/sound/soc/mxs/mxs-saif.c
> +++ b/sound/soc/mxs/mxs-saif.c
> @@ -607,22 +607,28 @@ static int mxs_saif_dai_probe(struct snd_soc_dai *dai)
>  	return 0;
>  }
>  
> -static struct snd_soc_dai_driver mxs_saif_dai = {
> -	.name = "mxs-saif",
> -	.probe = mxs_saif_dai_probe,
> -	.playback = {
> -		.channels_min = 2,
> -		.channels_max = 2,
> -		.rates = MXS_SAIF_RATES,
> -		.formats = MXS_SAIF_FORMATS,
> +static struct snd_soc_dai_driver mxs_saif_dai[2] = {
> +	{
> +		.name = "saif0",
> +		.probe = mxs_saif_dai_probe,
> +		.playback = {
> +			.channels_min = 2,
> +			.channels_max = 2,
> +			.rates = MXS_SAIF_RATES,
> +			.formats = MXS_SAIF_FORMATS,
> +		},
> +		.ops = &mxs_saif_dai_ops,
> +	}, {
> +		.name = "saif1",
> +		.probe = mxs_saif_dai_probe,
> +		.capture = {
> +			.channels_min = 2,
> +			.channels_max = 2,
> +			.rates = MXS_SAIF_RATES,
> +			.formats = MXS_SAIF_FORMATS,
> +		},
> +		.ops = &mxs_saif_dai_ops,
>  	},
> -	.capture = {
> -		.channels_min = 2,
> -		.channels_max = 2,
> -		.rates = MXS_SAIF_RATES,
> -		.formats = MXS_SAIF_FORMATS,
> -	},
> -	.ops = &mxs_saif_dai_ops,
>  };
>  
>  static const struct snd_soc_component_driver mxs_saif_component = {
> @@ -735,7 +741,7 @@ static int mxs_saif_probe(struct platform_device *pdev)
>  	platform_set_drvdata(pdev, saif);
>  
>  	ret = snd_soc_register_component(&pdev->dev, &mxs_saif_component,
> -					 &mxs_saif_dai, 1);
> +					 &mxs_saif_dai[saif->id], 1);
>  	if (ret) {
>  		dev_err(&pdev->dev, "register DAI failed\n");
>  		return ret;