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

Commit 980b0bc6 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: blackfin: Use dai_fmt 



Use the dai_link's dai_fmt attribute to setup the DAI format instead of doing
this manually.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 471280b7

sound/soc/blackfin/bf5xx-ad1836.c

+5 −12
Original line number Diff line number Diff line
@@ -40,20 +40,8 @@ static int bf5xx_ad1836_hw_params(struct snd_pcm_substream *substream, 
{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	unsigned int channel_map[] = {0, 4, 1, 5, 2, 6, 3, 7};

	int ret = 0;

	/* set cpu DAI configuration */

	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_A |

		SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBM_CFM);

	if (ret < 0)

		return ret;



	/* set codec DAI configuration */

	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_A |

		SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBM_CFM);

	if (ret < 0)

		return ret;



	/* set cpu DAI channel mapping */

	ret = snd_soc_dai_set_channel_map(cpu_dai, ARRAY_SIZE(channel_map),
@@ -68,6 +56,9 @@ static struct snd_soc_ops bf5xx_ad1836_ops = { 
	.hw_params = bf5xx_ad1836_hw_params,

};



#define BF5XX_AD1836_DAIFMT (SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_IF | \

				SND_SOC_DAIFMT_CBM_CFM)



static struct snd_soc_dai_link bf5xx_ad1836_dai[] = {

	{

		.name = "ad1836",
@@ -77,6 +68,7 @@ static struct snd_soc_dai_link bf5xx_ad1836_dai[] = { 
		.platform_name = "bfin-tdm-pcm-audio",

		.codec_name = "spi0.4",

		.ops = &bf5xx_ad1836_ops,

		.dai_fmt = BF5XX_AD1836_DAIFMT,

	},

	{

		.name = "ad1836",
@@ -86,6 +78,7 @@ static struct snd_soc_dai_link bf5xx_ad1836_dai[] = { 
		.platform_name = "bfin-tdm-pcm-audio",

		.codec_name = "spi0.4",

		.ops = &bf5xx_ad1836_ops,

		.dai_fmt = BF5XX_AD1836_DAIFMT,

	},

};

sound/soc/blackfin/bf5xx-ad193x.c

+5 −12
Original line number Diff line number Diff line
@@ -60,18 +60,6 @@ static int bf5xx_ad193x_hw_params(struct snd_pcm_substream *substream, 
		break;

	}



	/* set cpu DAI configuration */

	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_A |

		SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBM_CFM);

	if (ret < 0)

		return ret;



	/* set codec DAI configuration */

	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_A |

		SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBM_CFM);

	if (ret < 0)

		return ret;



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

	ret = snd_soc_dai_set_sysclk(codec_dai, 0, clk,

		SND_SOC_CLOCK_IN);
@@ -92,6 +80,9 @@ static int bf5xx_ad193x_hw_params(struct snd_pcm_substream *substream, 
	return 0;

}



#define BF5XX_AD193X_DAIFMT (SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_IF | \

				SND_SOC_DAIFMT_CBM_CFM)



static struct snd_soc_ops bf5xx_ad193x_ops = {

	.hw_params = bf5xx_ad193x_hw_params,

};
@@ -105,6 +96,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = { 
		.platform_name = "bfin-tdm-pcm-audio",

		.codec_name = "spi0.5",

		.ops = &bf5xx_ad193x_ops,

		.dai_fmt = BF5XX_AD193X_DAIFMT,

	},

	{

		.name = "ad193x",
@@ -114,6 +106,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = { 
		.platform_name = "bfin-tdm-pcm-audio",

		.codec_name = "spi0.5",

		.ops = &bf5xx_ad193x_ops,

		.dai_fmt = BF5XX_AD193X_DAIFMT,

	},

};

sound/soc/blackfin/bf5xx-ad73311.c

+4 −25
Original line number Diff line number Diff line
@@ -145,29 +145,8 @@ static int bf5xx_probe(struct snd_soc_card *card) 
	return 0;

}



static int bf5xx_ad73311_hw_params(struct snd_pcm_substream *substream,

	struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	int ret = 0;



	pr_debug("%s rate %d format %x\n", __func__, params_rate(params),

		params_format(params));



	/* set cpu DAI configuration */

	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_A |

		SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);

	if (ret < 0)

		return ret;



	return 0;

}





static struct snd_soc_ops bf5xx_ad73311_ops = {

	.hw_params = bf5xx_ad73311_hw_params,

};

#define BF5XX_AD7311_DAI_FMT (SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF | \

				SND_SOC_DAIFMT_CBM_CFM)



static struct snd_soc_dai_link bf5xx_ad73311_dai[] = {

	{
@@ -177,7 +156,7 @@ static struct snd_soc_dai_link bf5xx_ad73311_dai[] = { 
		.codec_dai_name = "ad73311-hifi",

		.platform_name = "bfin-i2s-pcm-audio",

		.codec_name = "ad73311",

		.ops = &bf5xx_ad73311_ops,

		.dai_fmt = BF5XX_AD7311_DAI_FMT,

	},

	{

		.name = "ad73311",
@@ -186,7 +165,7 @@ static struct snd_soc_dai_link bf5xx_ad73311_dai[] = { 
		.codec_dai_name = "ad73311-hifi",

		.platform_name = "bfin-i2s-pcm-audio",

		.codec_name = "ad73311",

		.ops = &bf5xx_ad73311_ops,

		.dai_fmt = BF5XX_AD7311_DAI_FMT,

	},

};

sound/soc/blackfin/bf5xx-ssm2602.c

+4 −16
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ static int bf5xx_ssm2602_hw_params(struct snd_pcm_substream *substream, 
{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	unsigned int clk = 0;

	int ret = 0;
@@ -75,21 +74,6 @@ static int bf5xx_ssm2602_hw_params(struct snd_pcm_substream *substream, 
		break;

	}



	/*

	 * CODEC is master for BCLK and LRC in this configuration.

	 */



	/* set codec DAI configuration */

	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 = 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;



	ret = snd_soc_dai_set_sysclk(codec_dai, SSM2602_SYSCLK, clk,

		SND_SOC_CLOCK_IN);

	if (ret < 0)
@@ -102,6 +86,10 @@ static struct snd_soc_ops bf5xx_ssm2602_ops = { 
	.hw_params = bf5xx_ssm2602_hw_params,

};



/* CODEC is master for BCLK and LRC in this configuration. */

#define BF5XX_SSM2602_DAIFMT (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | \

				SND_SOC_DAIFMT_CBM_CFM)



static struct snd_soc_dai_link bf5xx_ssm2602_dai[] = {

	{

		.name = "ssm2602",

sound/soc/blackfin/bfin-eval-adau1373.c

+2 −11
Original line number Diff line number Diff line
@@ -67,21 +67,10 @@ static int bfin_eval_adau1373_hw_params(struct snd_pcm_substream *substream, 
	struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	int ret;

	int pll_rate;



	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |

			SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);

	if (ret)

		return ret;



	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |

			SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);

	if (ret)

		return ret;



	switch (params_rate(params)) {

	case 48000:

	case 8000:
@@ -143,6 +132,8 @@ static struct snd_soc_dai_link bfin_eval_adau1373_dai = { 
	.codec_name = "adau1373.0-001a",

	.ops = &bfin_eval_adau1373_ops,

	.init = bfin_eval_adau1373_codec_init,

	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_CBM_CFM,

};



static struct snd_soc_card bfin_eval_adau1373 = {