openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: Use dai_fmt in Speyside 

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2011-09-27 16:48:49 +01:00
parent d5efccd5b6
commit 26e6781155
1 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sound/soc/samsung/speyside.c
View File

@ -92,33 +92,6 @@ static int speyside_set_bias_level_post(struct snd_soc_card *card,
return 0; return 0;
} }
static int speyside_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;
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;
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;
return 0;
}
static struct snd_soc_ops speyside_ops = {
.hw_params = speyside_hw_params,
};
static struct snd_soc_jack speyside_headset; static struct snd_soc_jack speyside_headset;
/* Headset jack detection DAPM pins */ /* Headset jack detection DAPM pins */
@ -208,7 +181,8 @@ static struct snd_soc_dai_link speyside_dai[] = {
.platform_name = "samsung-audio", .platform_name = "samsung-audio",
.codec_name = "wm8996.1-001a", .codec_name = "wm8996.1-001a",
.init = speyside_wm8996_init, .init = speyside_wm8996_init,
.ops = &speyside_ops, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBM_CFM,
}, },
{ {
.name = "Baseband", .name = "Baseband",
@ -216,7 +190,8 @@ static struct snd_soc_dai_link speyside_dai[] = {
.cpu_dai_name = "wm8996-aif2", .cpu_dai_name = "wm8996-aif2",
.codec_dai_name = "wm1250-ev1", .codec_dai_name = "wm1250-ev1",
.codec_name = "wm1250-ev1.1-0027", .codec_name = "wm1250-ev1.1-0027",
.ops = &speyside_ops, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBM_CFM,
.ignore_suspend = 1, .ignore_suspend = 1,
}, },
}; };