]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ASoC: rockchip-i2s: fix master mode set bit error
authorJianqun <jay.xu@rock-chips.com>
Sat, 13 Sep 2014 00:41:03 +0000 (08:41 +0800)
committerMark Brown <broonie@kernel.org>
Sat, 13 Sep 2014 16:34:16 +0000 (09:34 -0700)
Fix error format set to I2S master or slave mode.
Test on RK3288 board with max98090.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/rockchip/rockchip_i2s.c

index 8d8e4b59049f2669fc503e05dd66ef52cb9e960c..870a6645c7824d0c8f9f70d927595375ee4104b2 100644 (file)
@@ -165,13 +165,14 @@ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
        struct rk_i2s_dev *i2s = to_info(cpu_dai);
        unsigned int mask = 0, val = 0;
 
-       mask = I2S_CKR_MSS_SLAVE;
+       mask = I2S_CKR_MSS_MASK;
        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
        case SND_SOC_DAIFMT_CBS_CFS:
-               val = I2S_CKR_MSS_SLAVE;
+               /* Set source clock in Master mode */
+               val = I2S_CKR_MSS_MASTER;
                break;
        case SND_SOC_DAIFMT_CBM_CFM:
-               val = I2S_CKR_MSS_MASTER;
+               val = I2S_CKR_MSS_SLAVE;
                break;
        default:
                return -EINVAL;