summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorChen Zhen <zhen1.chen@samsung.com>2014-05-23 17:03:31 +0800
committerChanho Park <chanho61.park@samsung.com>2014-11-18 11:47:53 +0900
commitbb3c7e4efe2b15319a6aa19e51c89fddc72b2918 (patch)
treedd0f30fe0e449d91b9ef0e823066431932f28602 /sound/soc
parenta1c91d41f2878b66bff9d9b3b015ed7e732ed926 (diff)
downloadlinux-3.10-bb3c7e4efe2b15319a6aa19e51c89fddc72b2918.tar.gz
linux-3.10-bb3c7e4efe2b15319a6aa19e51c89fddc72b2918.tar.bz2
linux-3.10-bb3c7e4efe2b15319a6aa19e51c89fddc72b2918.zip
ASoC: samsung: set format constant in the dai_link
Change-Id: I93731b6d92954be19f752a2b4283a611e7a793de Signed-off-by: Chen Zhen <zhen1.chen@samsung.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/samsung/odroidx2_max98090.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/sound/soc/samsung/odroidx2_max98090.c b/sound/soc/samsung/odroidx2_max98090.c
index 5856ef9cd0e..c84ce75d8ee 100644
--- a/sound/soc/samsung/odroidx2_max98090.c
+++ b/sound/soc/samsung/odroidx2_max98090.c
@@ -25,18 +25,6 @@ static int odroidx2_hw_params(struct snd_pcm_substream *substream,
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;
-
ret = snd_soc_dai_set_sysclk(codec_dai, 3,
MAX98090_MCLK, SND_SOC_CLOCK_IN);
if (ret < 0) {
@@ -78,6 +66,8 @@ static struct snd_soc_dai_link odroidx2_dai[] = {
.name = "MAX98090",
.stream_name = "MAX98090 PCM",
.codec_dai_name = "HiFi",
+ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
+ | SND_SOC_DAIFMT_CBM_CFM,
.ops = &odroidx2_ops,
},
};