aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-09-27 11:42:27 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-09-28 08:22:33 -0400
commit44fdd4338749739692715f24907c450f6f410da3 (patch)
tree9c5d8b296ae9e96f60a3eded1716c422319aeae0
parent75d9ac46b99280f5f381927ae75a9eaf21844d20 (diff)
ASoC: Use dai_fmt in speyside_wm8962
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/samsung/speyside_wm8962.c19
1 files changed, 2 insertions, 17 deletions
diff --git a/sound/soc/samsung/speyside_wm8962.c b/sound/soc/samsung/speyside_wm8962.c
index 07b827e3b807..8a082044436e 100644
--- a/sound/soc/samsung/speyside_wm8962.c
+++ b/sound/soc/samsung/speyside_wm8962.c
@@ -94,23 +94,6 @@ static int speyside_wm8962_set_bias_level_post(struct snd_soc_card *card,
94static int speyside_wm8962_hw_params(struct snd_pcm_substream *substream, 94static int speyside_wm8962_hw_params(struct snd_pcm_substream *substream,
95 struct snd_pcm_hw_params *params) 95 struct snd_pcm_hw_params *params)
96{ 96{
97 struct snd_soc_pcm_runtime *rtd = substream->private_data;
98 struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
99 struct snd_soc_dai *codec_dai = rtd->codec_dai;
100 int ret;
101
102 ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S
103 | SND_SOC_DAIFMT_NB_NF
104 | SND_SOC_DAIFMT_CBM_CFM);
105 if (ret < 0)
106 return ret;
107
108 ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S
109 | SND_SOC_DAIFMT_NB_NF
110 | SND_SOC_DAIFMT_CBM_CFM);
111 if (ret < 0)
112 return ret;
113
114 sample_rate = params_rate(params); 97 sample_rate = params_rate(params);
115 98
116 return 0; 99 return 0;
@@ -128,6 +111,8 @@ static struct snd_soc_dai_link speyside_wm8962_dai[] = {
128 .codec_dai_name = "wm8962", 111 .codec_dai_name = "wm8962",
129 .platform_name = "samsung-audio", 112 .platform_name = "samsung-audio",
130 .codec_name = "wm8962.1-001a", 113 .codec_name = "wm8962.1-001a",
114 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
115 | SND_SOC_DAIFMT_CBM_CFM,
131 .ops = &speyside_wm8962_ops, 116 .ops = &speyside_wm8962_ops,
132 }, 117 },
133}; 118};