ASoC: correct s6000 I2S clock polarity

According to the data sheet data is clocked out on the falling edge
and latched on the rising edge of the bit clock. While the left sample
is transmitted the word clock line is low.

Signed-off-by: Daniel Glöckner <dg@emlix.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/s6000/s6000-i2s.c b/sound/soc/s6000/s6000-i2s.c
index dcc79040bdacb2f2aedce77822dcfc6e93af6729..c5cda187ecab6d5f72285959e39e525d34f3ffb9 100644 (file)
--- a/sound/soc/s6000/s6000-i2s.c
+++ b/sound/soc/s6000/s6000-i2s.c
@@ -252,10 +252,10 @@ static int s6000_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai,
        }
 
        switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
-       case SND_SOC_DAIFMT_IB_IF:
+       case SND_SOC_DAIFMT_NB_NF:
                w |= S6_I2S_LEFT_FIRST;
                break;
-       case SND_SOC_DAIFMT_IB_NF:
+       case SND_SOC_DAIFMT_NB_IF:
                w |= S6_I2S_RIGHT_FIRST;
                break;
        default:

diff --git a/sound/soc/s6000/s6105-ipcam.c b/sound/soc/s6000/s6105-ipcam.c
index 21c4f55106ca9a0b4cc240dfb00eb6f7a5baa0c5..b5f95f9781c10d6b14f9050292508b9c533135a2 100644 (file)
--- a/sound/soc/s6000/s6105-ipcam.c
+++ b/sound/soc/s6000/s6105-ipcam.c
@@ -43,7 +43,7 @@ static int s6105_hw_params(struct snd_pcm_substream *substream,
 
        /* set cpu DAI configuration */
        ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_CBM_CFM |
-                                          SND_SOC_DAIFMT_IB_IF);
+                                          SND_SOC_DAIFMT_NB_NF);
        if (ret < 0)
                return ret;