ASoC: Merge fixes

[linux-2.6-microblaze.git] / sound / soc / rockchip / rockchip_i2s.c

diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index 99a128a..be051e4 100644 (file)
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -261,13 +261,13 @@ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
 
        pm_runtime_get_sync(cpu_dai->dev);
        mask = I2S_CKR_MSS_MASK;
-       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBS_CFS:
+       switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_BP_FP:
                /* Set source clock in Master mode */
                val = I2S_CKR_MSS_MASTER;
                i2s->is_master_mode = true;
                break;
-       case SND_SOC_DAIFMT_CBM_CFM:
+       case SND_SOC_DAIFMT_BC_FC:
                val = I2S_CKR_MSS_SLAVE;
                i2s->is_master_mode = false;
                break;