diff options
Diffstat (limited to 'sound/soc/omap/omap3evm.c')
| -rw-r--r-- | sound/soc/omap/omap3evm.c | 23 | 
1 files changed, 2 insertions, 21 deletions
diff --git a/sound/soc/omap/omap3evm.c b/sound/soc/omap/omap3evm.c index 0daa0446983..bf9ae2a6f90 100644 --- a/sound/soc/omap/omap3evm.c +++ b/sound/soc/omap/omap3evm.c @@ -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,  };  |