ASoC: change set_tdm_slot api to allow slot_width override.

[linux-2.6-block.git] / sound / soc / pxa / magician.c

diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c
index 9fe4ad20615cf19908222d5cea7cc4e12f069914..9f7c61e23dafbdf597a84779b231878cf6d9b12a 100644 (file)
--- a/sound/soc/pxa/magician.c
+++ b/sound/soc/pxa/magician.c
@@ -186,11 +186,11 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream,
 
        /* set cpu DAI configuration */
        ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_A |
-                       SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBS_CFS);
+                       SND_SOC_DAIFMT_NB_IF | SND_SOC_DAIFMT_CBS_CFS);
        if (ret < 0)
                return ret;
 
-       ret = snd_soc_dai_set_tdm_slot(cpu_dai, 1, 1);
+       ret = snd_soc_dai_set_tdm_slot(cpu_dai, 1, 0, 1, width);
        if (ret < 0)
                return ret;