aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-12-20 03:13:26 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-20 05:15:53 -0500
commit673847cfb0b07ba42d23f32d42e59eeda81c3b2f (patch)
treeb4683c46885c2972743747b08bb331f5034639ae /sound/soc
parent5b48a5a6dfd44ac80775d94e4ec573f4edda9144 (diff)
ASoC: Use dai_fmt in hx4700 machine driver
Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/pxa/hx4700.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c
index 03ef9f393434..8260207818a5 100644
--- a/sound/soc/pxa/hx4700.c
+++ b/sound/soc/pxa/hx4700.c
@@ -65,20 +65,6 @@ static int hx4700_hw_params(struct snd_pcm_substream *substream,
65 struct snd_soc_dai *cpu_dai = rtd->cpu_dai; 65 struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
66 int ret = 0; 66 int ret = 0;
67 67
68 /* set codec DAI configuration */
69 ret = snd_soc_dai_set_fmt(codec_dai,
70 SND_SOC_DAIFMT_MSB | SND_SOC_DAIFMT_NB_NF |
71 SND_SOC_DAIFMT_CBS_CFS);
72 if (ret < 0)
73 return ret;
74
75 /* set cpu DAI configuration */
76 ret = snd_soc_dai_set_fmt(cpu_dai,
77 SND_SOC_DAIFMT_MSB | SND_SOC_DAIFMT_NB_NF |
78 SND_SOC_DAIFMT_CBS_CFS);
79 if (ret < 0)
80 return ret;
81
82 /* set the I2S system clock as output */ 68 /* set the I2S system clock as output */
83 ret = snd_soc_dai_set_sysclk(cpu_dai, PXA2XX_I2S_SYSCLK, 0, 69 ret = snd_soc_dai_set_sysclk(cpu_dai, PXA2XX_I2S_SYSCLK, 0,
84 SND_SOC_CLOCK_OUT); 70 SND_SOC_CLOCK_OUT);
@@ -175,6 +161,8 @@ static struct snd_soc_dai_link hx4700_dai = {
175 .platform_name = "pxa-pcm-audio", 161 .platform_name = "pxa-pcm-audio",
176 .codec_name = "ak4641.0-0012", 162 .codec_name = "ak4641.0-0012",
177 .init = hx4700_ak4641_init, 163 .init = hx4700_ak4641_init,
164 .dai_fmt = SND_SOC_DAIFMT_MSB | SND_SOC_DAIFMT_NB_NF |
165 SND_SOC_DAIFMT_CBS_CFS,
178 .ops = &hx4700_ops, 166 .ops = &hx4700_ops,
179}; 167};
180 168