Commit cf9feff2 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Mark Brown
Browse files

ASoC: omap: Convert bunch of machine drivers to use init time DAI format 



Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@bitmer.com>
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 4dd04172

sound/soc/omap/am3517evm.c

+2 −20
Original line number Diff line number Diff line
@@ -43,26 +43,6 @@ static int am3517evm_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	int ret;



	/* Set codec DAI configuration */

	ret = snd_soc_dai_set_fmt(codec_dai,

				  SND_SOC_DAIFMT_DSP_B |

				  SND_SOC_DAIFMT_NB_NF |

				  SND_SOC_DAIFMT_CBM_CFM);

	if (ret < 0) {

		printk(KERN_ERR "can't set codec DAI configuration\n");

		return ret;

	}



	/* Set cpu DAI configuration */

	ret = snd_soc_dai_set_fmt(cpu_dai,

				  SND_SOC_DAIFMT_DSP_B |

				  SND_SOC_DAIFMT_NB_NF |

				  SND_SOC_DAIFMT_CBM_CFM);

	if (ret < 0) {

		printk(KERN_ERR "can't set cpu DAI configuration\n");

		return ret;

	}



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

	ret = snd_soc_dai_set_sysclk(codec_dai, 0,

			CODEC_CLOCK, SND_SOC_CLOCK_IN);
@@ -140,6 +120,8 @@ static struct snd_soc_dai_link am3517evm_dai = { 
	.codec_dai_name = "tlv320aic23-hifi",

	.platform_name = "omap-pcm-audio",

	.codec_name = "tlv320aic23-codec.2-001a",

	.dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF |

		   SND_SOC_DAIFMT_CBM_CFM,

	.init = am3517evm_aic23_init,

	.ops = &am3517evm_ops,

};

sound/soc/omap/igep0020.c

+2 −21
Original line number Diff line number Diff line
@@ -38,29 +38,8 @@ static int igep2_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;

	int ret;



	/* 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) {

		printk(KERN_ERR "can't set codec DAI configuration\n");

		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) {

		printk(KERN_ERR "can't set cpu DAI configuration\n");

		return ret;

	}



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

	ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000,

					    SND_SOC_CLOCK_IN);
@@ -84,6 +63,8 @@ static struct snd_soc_dai_link igep2_dai = { 
	.codec_dai_name = "twl4030-hifi",

	.platform_name = "omap-pcm-audio",

	.codec_name = "twl4030-codec",

	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

		   SND_SOC_DAIFMT_CBM_CFM,

	.ops = &igep2_ops,

};

sound/soc/omap/n810.c

+2 −17
Original line number Diff line number Diff line
@@ -115,25 +115,8 @@ static int n810_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;

	int err;



	/* Set codec DAI configuration */

	err = snd_soc_dai_set_fmt(codec_dai,

					 SND_SOC_DAIFMT_I2S |

					 SND_SOC_DAIFMT_NB_NF |

					 SND_SOC_DAIFMT_CBM_CFM);

	if (err < 0)

		return err;



	/* Set cpu DAI configuration */

	err = snd_soc_dai_set_fmt(cpu_dai,

				       SND_SOC_DAIFMT_I2S |

				       SND_SOC_DAIFMT_NB_NF |

				       SND_SOC_DAIFMT_CBM_CFM);

	if (err < 0)

		return err;



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

	err = snd_soc_dai_set_sysclk(codec_dai, 0, 12000000,

					    SND_SOC_CLOCK_IN);
@@ -312,6 +295,8 @@ static struct snd_soc_dai_link n810_dai = { 
	.platform_name = "omap-pcm-audio",

	.codec_name = "tlv320aic3x-codec.2-0018",

	.codec_dai_name = "tlv320aic3x-hifi",

	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

		   SND_SOC_DAIFMT_CBM_CFM,

	.init = n810_aic33_init,

	.ops = &n810_ops,

};

sound/soc/omap/omap3evm.c

+2 −21
Original line number Diff line number Diff line
@@ -36,29 +36,8 @@ static int omap3evm_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;

	int ret;



	/* 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) {

		printk(KERN_ERR "Can't set codec DAI configuration\n");

		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) {

		printk(KERN_ERR "Can't set cpu DAI configuration\n");

		return ret;

	}



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

	ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000,

				     SND_SOC_CLOCK_IN);
@@ -82,6 +61,8 @@ static struct snd_soc_dai_link omap3evm_dai = { 
	.codec_dai_name = "twl4030-hifi",

	.platform_name = "omap-pcm-audio",

	.codec_name = "twl4030-codec",

	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

		   SND_SOC_DAIFMT_CBM_CFM,

	.ops 		= &omap3evm_ops,

};

sound/soc/omap/omap3pandora.c

+4 −16
Original line number Diff line number Diff line
@@ -48,24 +48,8 @@ static int omap3pandora_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;

	int fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

		  SND_SOC_DAIFMT_CBS_CFS;

	int ret;



	/* Set codec DAI configuration */

	ret = snd_soc_dai_set_fmt(codec_dai, fmt);

	if (ret < 0) {

		pr_err(PREFIX "can't set codec DAI configuration\n");

		return ret;

	}



	/* Set cpu DAI configuration */

	ret = snd_soc_dai_set_fmt(cpu_dai, fmt);

	if (ret < 0) {

		pr_err(PREFIX "can't set cpu DAI configuration\n");

		return ret;

	}



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

	ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000,

					    SND_SOC_CLOCK_IN);
@@ -231,6 +215,8 @@ static struct snd_soc_dai_link omap3pandora_dai[] = { 
		.codec_dai_name = "twl4030-hifi",

		.platform_name = "omap-pcm-audio",

		.codec_name = "twl4030-codec",

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			   SND_SOC_DAIFMT_CBS_CFS,

		.ops = &omap3pandora_ops,

		.init = omap3pandora_out_init,

	}, {
@@ -240,6 +226,8 @@ static struct snd_soc_dai_link omap3pandora_dai[] = { 
		.codec_dai_name = "twl4030-hifi",

		.platform_name = "omap-pcm-audio",

		.codec_name = "twl4030-codec",

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			   SND_SOC_DAIFMT_CBS_CFS,

		.ops = &omap3pandora_ops,

		.init = omap3pandora_in_init,

	}