Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64105cfd authored by Liam Girdwood's avatar Liam Girdwood Committed by Jaroslav Kysela
Browse files

ALSA: asoc: machines - add Digital Audio Interface (DAI) control functions. 



This patch adds several functions for DAI control and config
and replaces the current method of calling function pointers within
the DAI struct within the machine drivers.

Signed-off-by: default avatarLiam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 8c6529db

sound/soc/at32/playpaq_wm8510.c

+7 −9
Original line number Diff line number Diff line
@@ -210,14 +210,14 @@ static int playpaq_wm8510_hw_params(struct snd_pcm_substream *substream, 
	/*

	 * set CPU and CODEC DAI configuration

	 */

	ret = codec_dai->dai_ops.set_fmt(codec_dai, fmt);

	ret = snd_soc_dai_set_fmt(codec_dai, fmt);

	if (ret < 0) {

		pr_warning("playpaq_wm8510: "

			   "Failed to set CODEC DAI format (%d)\n",

			   ret);

		return ret;

	}

	ret = cpu_dai->dai_ops.set_fmt(cpu_dai, fmt);

	ret = snd_soc_dai_set_fmt(cpu_dai, fmt);

	if (ret < 0) {

		pr_warning("playpaq_wm8510: "

			   "Failed to set CPU DAI format (%d)\n",
@@ -233,14 +233,13 @@ static int playpaq_wm8510_hw_params(struct snd_pcm_substream *substream, 
	cd = playpaq_wm8510_calc_ssc_clock(params, cpu_dai);

	pr_debug("playpaq_wm8510: cmr_div = %d, period = %d\n",

		 cd.cmr_div, cd.period);

	ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai,

					  AT32_SSC_CMR_DIV, cd.cmr_div);

	ret = snd_soc_dai_set_clkdiv(cpu_dai, AT32_SSC_CMR_DIV, cd.cmr_div);

	if (ret < 0) {

		pr_warning("playpaq_wm8510: Failed to set CPU CMR_DIV (%d)\n",

			   ret);

		return ret;

	}

	ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai, AT32_SSC_TCMR_PERIOD,

	ret = snd_soc_dai_set_clkdiv(cpu_dai, AT32_SSC_TCMR_PERIOD,

					  cd.period);

	if (ret < 0) {

		pr_warning("playpaq_wm8510: "
@@ -260,7 +259,7 @@ static int playpaq_wm8510_hw_params(struct snd_pcm_substream *substream, 




#if !defined CONFIG_SND_AT32_SOC_PLAYPAQ_SLAVE

	ret = codec_dai->dai_ops.set_clkdiv(codec_dai, WM8510_BCLKDIV, bclk);

	ret = snd_soc_dai_set_clkdiv(codec_dai, WM8510_BCLKDIV, bclk);

	if (ret < 0) {

		pr_warning

		    ("playpaq_wm8510: Failed to set CODEC DAI BCLKDIV (%d)\n",
@@ -270,7 +269,7 @@ static int playpaq_wm8510_hw_params(struct snd_pcm_substream *substream, 
#endif /* CONFIG_SND_AT32_SOC_PLAYPAQ_SLAVE */





	ret = codec_dai->dai_ops.set_pll(codec_dai, 0,

	ret = snd_soc_dai_set_pll(codec_dai, 0,

					 clk_get_rate(CODEC_CLK), pll_out);

	if (ret < 0) {

		pr_warning("playpaq_wm8510: Failed to set CODEC DAI PLL (%d)\n",
@@ -279,8 +278,7 @@ static int playpaq_wm8510_hw_params(struct snd_pcm_substream *substream, 
	}





	ret = codec_dai->dai_ops.set_clkdiv(codec_dai,

					    WM8510_MCLKDIV, mclk_div);

	ret = snd_soc_dai_set_clkdiv(codec_dai, WM8510_MCLKDIV, mclk_div);

	if (ret < 0) {

		pr_warning("playpaq_wm8510: Failed to set CODEC MCLKDIV (%d)\n",

			   ret);

sound/soc/at91/eti_b1_wm8731.c

+9 −9
Original line number Diff line number Diff line
@@ -58,13 +58,13 @@ static int eti_b1_startup(struct snd_pcm_substream *substream) 
	int ret;



	/* cpu clock is the AT91 master clock sent to the SSC */

	ret = cpu_dai->dai_ops.set_sysclk(cpu_dai, AT91_SYSCLK_MCK,

	ret = snd_soc_dai_set_sysclk(cpu_dai, AT91_SYSCLK_MCK,

		60000000, SND_SOC_CLOCK_IN);

	if (ret < 0)

		return ret;



	/* codec system clock is supplied by PCK1, set to 12MHz */

	ret = codec_dai->dai_ops.set_sysclk(codec_dai, WM8731_SYSCLK,

	ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK,

		12000000, SND_SOC_CLOCK_IN);

	if (ret < 0)

		return ret;
@@ -96,13 +96,13 @@ static int eti_b1_hw_params(struct snd_pcm_substream *substream, 
	int cmr_div, period;



	/* set codec DAI configuration */

	ret = codec_dai->dai_ops.set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |

	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |

		SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);

	if (ret < 0)

		return ret;



	/* set cpu DAI configuration */

	ret = cpu_dai->dai_ops.set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |

	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |

		SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);

	if (ret < 0)

		return ret;
@@ -141,17 +141,17 @@ static int eti_b1_hw_params(struct snd_pcm_substream *substream, 
	}



	/* set the MCK divider for BCLK */

	ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai, AT91SSC_CMR_DIV, cmr_div);

	ret = snd_soc_dai_set_clkdiv(cpu_dai, AT91SSC_CMR_DIV, cmr_div);

	if (ret < 0)

		return ret;



	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

		/* set the BCLK divider for DACLRC */

		ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai,

		ret = snd_soc_dai_set_clkdiv(cpu_dai,

						AT91SSC_TCMR_PERIOD, period);

	} else {

		/* set the BCLK divider for ADCLRC */

		ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai,

		ret = snd_soc_dai_set_clkdiv(cpu_dai,

						AT91SSC_RCMR_PERIOD, period);

	}

	if (ret < 0)
@@ -163,13 +163,13 @@ static int eti_b1_hw_params(struct snd_pcm_substream *substream, 
	 */



	/* set codec DAI configuration */

	ret = codec_dai->dai_ops.set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |

	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |

		SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);

	if (ret < 0)

		return ret;



	/* set cpu DAI configuration */

	ret = cpu_dai->dai_ops.set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |

	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |

		SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);

	if (ret < 0)

		return ret;

sound/soc/davinci/davinci-evm.c

+3 −3
Original line number Diff line number Diff line
@@ -38,19 +38,19 @@ static int evm_hw_params(struct snd_pcm_substream *substream, 
	int ret = 0;



	/* set codec DAI configuration */

	ret = codec_dai->dai_ops.set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |

	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |

					 SND_SOC_DAIFMT_CBM_CFM);

	if (ret < 0)

		return ret;



	/* set cpu DAI configuration */

	ret = cpu_dai->dai_ops.set_fmt(cpu_dai, SND_SOC_DAIFMT_CBM_CFM |

	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_CBM_CFM |

				       SND_SOC_DAIFMT_IB_NF);

	if (ret < 0)

		return ret;



	/* set the codec system clock */

	ret = codec_dai->dai_ops.set_sysclk(codec_dai, 0, EVM_CODEC_CLOCK,

	ret = snd_soc_dai_set_sysclk(codec_dai, 0, EVM_CODEC_CLOCK,

					    SND_SOC_CLOCK_OUT);

	if (ret < 0)

		return ret;

sound/soc/fsl/mpc8610_hpcd.c

+24 −34
Original line number Diff line number Diff line
@@ -103,33 +103,26 @@ static int mpc8610_hpcd_startup(struct snd_pcm_substream *substream) 
	int ret = 0;



	/* Tell the CPU driver what the serial protocol is. */

	if (cpu_dai->dai_ops.set_fmt) {

		ret = cpu_dai->dai_ops.set_fmt(cpu_dai,

			machine_data->dai_format);

	ret = snd_soc_dai_set_fmt(cpu_dai, machine_data->dai_format);

	if (ret < 0) {

		dev_err(substream->pcm->card->dev,

			"could not set CPU driver audio format\n");

		return ret;

	}

	}



	/* Tell the codec driver what the serial protocol is. */

	if (codec_dai->dai_ops.set_fmt) {

		ret = codec_dai->dai_ops.set_fmt(codec_dai,

			machine_data->dai_format);

	ret = snd_soc_dai_set_fmt(codec_dai, machine_data->dai_format);

	if (ret < 0) {

		dev_err(substream->pcm->card->dev,

			"could not set codec driver audio format\n");

		return ret;

	}

	}



	/*

	 * Tell the CPU driver what the clock frequency is, and whether it's a

	 * slave or master.

	 */

	if (cpu_dai->dai_ops.set_sysclk) {

		ret = cpu_dai->dai_ops.set_sysclk(cpu_dai, 0,

	ret = snd_soc_dai_set_sysclk(cpu_dai, 0,

					machine_data->clk_frequency,

					machine_data->cpu_clk_direction);

	if (ret < 0) {
@@ -137,14 +130,12 @@ static int mpc8610_hpcd_startup(struct snd_pcm_substream *substream) 
			"could not set CPU driver clock parameters\n");

		return ret;

	}

	}



	/*

	 * Tell the codec driver what the MCLK frequency is, and whether it's

	 * a slave or master.

	 */

	if (codec_dai->dai_ops.set_sysclk) {

		ret = codec_dai->dai_ops.set_sysclk(codec_dai, 0,

	ret = snd_soc_dai_set_sysclk(codec_dai, 0,

					machine_data->clk_frequency,

					machine_data->codec_clk_direction);

	if (ret < 0) {
@@ -152,7 +143,6 @@ static int mpc8610_hpcd_startup(struct snd_pcm_substream *substream) 
			"could not set codec driver clock params\n");

		return ret;

	}

	}



	return 0;

}

sound/soc/omap/n810.c

+3 −3
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static int n810_hw_params(struct snd_pcm_substream *substream, 
	int err;



	/* Set codec DAI configuration */

	err = codec_dai->dai_ops.set_fmt(codec_dai,

	err = snd_soc_dai_set_fmt(codec_dai,

					 SND_SOC_DAIFMT_I2S |

					 SND_SOC_DAIFMT_NB_NF |

					 SND_SOC_DAIFMT_CBM_CFM);
@@ -99,7 +99,7 @@ static int n810_hw_params(struct snd_pcm_substream *substream, 
		return err;



	/* Set cpu DAI configuration */

	err = cpu_dai->dai_ops.set_fmt(cpu_dai,

	err = snd_soc_dai_set_fmt(cpu_dai,

				       SND_SOC_DAIFMT_I2S |

				       SND_SOC_DAIFMT_NB_NF |

				       SND_SOC_DAIFMT_CBM_CFM);
@@ -107,7 +107,7 @@ static int n810_hw_params(struct snd_pcm_substream *substream, 
		return err;



	/* Set the codec system clock for DAC and ADC */

	err = codec_dai->dai_ops.set_sysclk(codec_dai, 0, 12000000,

	err = snd_soc_dai_set_sysclk(codec_dai, 0, 12000000,

					    SND_SOC_CLOCK_IN);



	return err;