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

Commit 408dafc4 authored by Stephen Warren's avatar Stephen Warren Committed by Mark Brown
Browse files

ASoC: tegra: statically define DAI link format 



Define the DAI format statically in the dai_link, rather than executing
code to set it each time the hw params are set.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 9515c101

sound/soc/tegra/tegra_wm8903.c

+3 −19
Original line number Original line Diff line number Diff line
@@ -58,7 +58,6 @@ static int tegra_wm8903_hw_params(struct snd_pcm_substream *substream, 
{

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_card *card = codec->card;

	struct snd_soc_card *card = codec->card;

	struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);

	struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
@@ -86,24 +85,6 @@ static int tegra_wm8903_hw_params(struct snd_pcm_substream *substream, 
		return err;

		return err;

	}

	}





	err = snd_soc_dai_set_fmt(codec_dai,

					SND_SOC_DAIFMT_I2S |

					SND_SOC_DAIFMT_NB_NF |

					SND_SOC_DAIFMT_CBS_CFS);

	if (err < 0) {

		dev_err(card->dev, "codec_dai fmt not set\n");

		return err;

	}



	err = snd_soc_dai_set_fmt(cpu_dai,

					SND_SOC_DAIFMT_I2S |

					SND_SOC_DAIFMT_NB_NF |

					SND_SOC_DAIFMT_CBS_CFS);

	if (err < 0) {

		dev_err(card->dev, "cpu_dai fmt not set\n");

		return err;

	}



	err = snd_soc_dai_set_sysclk(codec_dai, 0, mclk,

	err = snd_soc_dai_set_sysclk(codec_dai, 0, mclk,

					SND_SOC_CLOCK_IN);

					SND_SOC_CLOCK_IN);

	if (err < 0) {

	if (err < 0) {
@@ -240,6 +221,9 @@ static struct snd_soc_dai_link tegra_wm8903_dai = { 
	.codec_dai_name = "wm8903-hifi",

	.codec_dai_name = "wm8903-hifi",

	.init = tegra_wm8903_init,

	.init = tegra_wm8903_init,

	.ops = &tegra_wm8903_ops,

	.ops = &tegra_wm8903_ops,

	.dai_fmt = SND_SOC_DAIFMT_I2S |

		   SND_SOC_DAIFMT_NB_NF |

		   SND_SOC_DAIFMT_CBS_CFS,

};

};





static struct snd_soc_card snd_soc_tegra_wm8903 = {

static struct snd_soc_card snd_soc_tegra_wm8903 = {

sound/soc/tegra/trimslice.c

+3 −19
Original line number Original line Diff line number Diff line
@@ -52,7 +52,6 @@ static int trimslice_asoc_hw_params(struct snd_pcm_substream *substream, 
{

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_card *card = codec->card;

	struct snd_soc_card *card = codec->card;

	struct tegra_trimslice *trimslice = snd_soc_card_get_drvdata(card);

	struct tegra_trimslice *trimslice = snd_soc_card_get_drvdata(card);
@@ -68,24 +67,6 @@ static int trimslice_asoc_hw_params(struct snd_pcm_substream *substream, 
		return err;

		return err;

	}

	}





	err = snd_soc_dai_set_fmt(codec_dai,

					SND_SOC_DAIFMT_I2S |

					SND_SOC_DAIFMT_NB_NF |

					SND_SOC_DAIFMT_CBS_CFS);

	if (err < 0) {

		dev_err(card->dev, "codec_dai fmt not set\n");

		return err;

	}



	err = snd_soc_dai_set_fmt(cpu_dai,

					SND_SOC_DAIFMT_I2S |

					SND_SOC_DAIFMT_NB_NF |

					SND_SOC_DAIFMT_CBS_CFS);

	if (err < 0) {

		dev_err(card->dev, "cpu_dai fmt not set\n");

		return err;

	}



	err = snd_soc_dai_set_sysclk(codec_dai, 0, mclk,

	err = snd_soc_dai_set_sysclk(codec_dai, 0, mclk,

					SND_SOC_CLOCK_IN);

					SND_SOC_CLOCK_IN);

	if (err < 0) {

	if (err < 0) {
@@ -121,6 +102,9 @@ static struct snd_soc_dai_link trimslice_tlv320aic23_dai = { 
	.cpu_dai_name = "tegra20-i2s.0",

	.cpu_dai_name = "tegra20-i2s.0",

	.codec_dai_name = "tlv320aic23-hifi",

	.codec_dai_name = "tlv320aic23-hifi",

	.ops = &trimslice_asoc_ops,

	.ops = &trimslice_asoc_ops,

	.dai_fmt = SND_SOC_DAIFMT_I2S |

		   SND_SOC_DAIFMT_NB_NF |

		   SND_SOC_DAIFMT_CBS_CFS,

};

};





static struct snd_soc_card snd_soc_trimslice = {

static struct snd_soc_card snd_soc_trimslice = {