[alsa-devel] [PATCH] ASoC: AMD: Configure master codec on all playback/capture cases

[Guenter Roeck]

On Fri, Feb 15, 2019 at 07:06:15AM +0000, Agrawal, Akshu wrote:
> In the system design da7219 is the master codec and clocks are
> generated by it.
> Bclk is to be generated at the required rate for other codecs used when
> da7219 is acting only as clock master. For this call hw_params of da7219
> during playback/capture on non da7219 codecs.
> 
> Being able to set bclk at lower rate also fixes noise issue observed on
> some dmics.
> 
> Signed-off-by: Akshu Agrawal <akshu.agrawal at amd.com>
> Reviewed-by: Adam Thomson <Adam.Thomson.Opensource at diasemi.com>
> ---
>  sound/soc/amd/acp-da7219-max98357a.c | 20 ++++++++++++++++++--
>  1 file changed, 18 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c
> index a5daad973ce5..ad327415290a 100644
> --- a/sound/soc/amd/acp-da7219-max98357a.c
> +++ b/sound/soc/amd/acp-da7219-max98357a.c
> @@ -45,6 +45,7 @@
>  #define CZ_PLAT_CLK 48000000
>  #define DUAL_CHANNEL		2
>  
> +static struct snd_soc_dai *codec_dai;
>  static struct snd_soc_jack cz_jack;
>  static struct clk *da7219_dai_clk;
>  extern int bt_uart_enable;
> @@ -53,8 +54,10 @@ static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd)
>  {
>  	int ret;
>  	struct snd_soc_card *card = rtd->card;
> -	struct snd_soc_dai *codec_dai = rtd->codec_dai;
> -	struct snd_soc_component *component = codec_dai->component;
> +	struct snd_soc_component *component;
> +
> +	codec_dai = rtd->codec_dai;
> +	component = codec_dai->component;
>  
>  	dev_info(rtd->dev, "codec dai name = %s\n", codec_dai->name);
>  
> @@ -255,6 +258,16 @@ static void cz_dmic_shutdown(struct snd_pcm_substream *substream)
>  	da7219_clk_disable();
>  }
>  
> +static static int cz_da7219_hw_params(struct snd_pcm_substream *substream,

s/static static/static/

gcc doesn't like the double static (at least neither gcc 6.5.0 nor 8.1.0
do), and it doesn't seem to be syntactically correct (even though,
oddly enough, clang accepts it w/o error message).

Guenter

> +				    struct snd_pcm_hw_params *params)
> +{
> +	/* da7219 Codec is clock master so setup as per the needs */
> +	if (codec_dai->driver->ops->hw_params)
> +		return codec_dai->driver->ops->hw_params(substream, params,
> +							 codec_dai);
> +	return 0;
> +}
> +
>  static const struct snd_soc_ops cz_da7219_play_ops = {
>  	.startup = cz_da7219_play_startup,
>  	.shutdown = cz_da7219_shutdown,
> @@ -268,16 +281,19 @@ static const struct snd_soc_ops cz_da7219_cap_ops = {
>  static const struct snd_soc_ops cz_max_play_ops = {
>  	.startup = cz_max_startup,
>  	.shutdown = cz_max_shutdown,
> +	.hw_params = cz_da7219_hw_params,
>  };
>  
>  static const struct snd_soc_ops cz_dmic0_cap_ops = {
>  	.startup = cz_dmic0_startup,
>  	.shutdown = cz_dmic_shutdown,
> +	.hw_params = cz_da7219_hw_params,
>  };
>  
>  static const struct snd_soc_ops cz_dmic1_cap_ops = {
>  	.startup = cz_dmic1_startup,
>  	.shutdown = cz_dmic_shutdown,
> +	.hw_params = cz_da7219_hw_params,
>  };
>  
>  static struct snd_soc_dai_link cz_dai_7219_98357[] = {