|
@@ -41,7 +41,6 @@ static int smdk_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;
|
|
|
unsigned int pll_out;
|
|
|
int ret;
|
|
@@ -54,18 +53,6 @@ static int smdk_hw_params(struct snd_pcm_substream *substream,
|
|
|
else
|
|
|
pll_out = params_rate(params) * 256;
|
|
|
|
|
|
- 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;
|
|
|
-
|
|
|
ret = snd_soc_dai_set_pll(codec_dai, WM8994_FLL1, WM8994_FLL_SRC_MCLK1,
|
|
|
SMDK_WM8994_FREQ, pll_out);
|
|
|
if (ret < 0)
|
|
@@ -131,6 +118,8 @@ static struct snd_soc_dai_link smdk_dai[] = {
|
|
|
.platform_name = "samsung-i2s.0",
|
|
|
.codec_name = "wm8994-codec",
|
|
|
.init = smdk_wm8994_init_paiftx,
|
|
|
+ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
|
|
|
+ SND_SOC_DAIFMT_CBM_CFM,
|
|
|
.ops = &smdk_ops,
|
|
|
}, { /* Sec_Fifo Playback i/f */
|
|
|
.name = "Sec_FIFO TX",
|
|
@@ -139,6 +128,8 @@ static struct snd_soc_dai_link smdk_dai[] = {
|
|
|
.codec_dai_name = "wm8994-aif1",
|
|
|
.platform_name = "samsung-i2s-sec",
|
|
|
.codec_name = "wm8994-codec",
|
|
|
+ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
|
|
|
+ SND_SOC_DAIFMT_CBM_CFM,
|
|
|
.ops = &smdk_ops,
|
|
|
},
|
|
|
};
|