From: 胡卫国 <hwg@rk29.(none)>
Date: Tue, 20 Sep 2011 03:58:17 +0000 (+0800)
Subject: i2s0再次修改：
X-Git-Tag: firefly_0821_release~9767^2~25^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3282ee6dd3f95339799d1ba3fd62a015de70b6af;p=firefly-linux-kernel-4.4.55.git

i2s0再次修改：
  1) i2s0的rx, tx两者都为master
  2) 硬件上针对只有一路LRCK的codec，例如alc5631/5621，只将I2S0_LRCK连接到codec的LRCK, I2S0_LRCK_RX直接断开
---

diff --git a/sound/soc/rk29/rk29_i2s.c b/sound/soc/rk29/rk29_i2s.c
index 809efcf6d25d..62f54413b748 100755
--- a/sound/soc/rk29/rk29_i2s.c
+++ b/sound/soc/rk29/rk29_i2s.c
@@ -271,7 +271,7 @@ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
                         return -EINVAL;
         }
         I2S_DBG("Enter::%s----%d, I2S_TXCR=0x%X\n",__FUNCTION__,__LINE__,tx_ctl);
-#if defined(CONFIG_SND_RK29_SOC_alc5631) || defined(CONFIG_SND_RK29_SOC_alc5621)
+#if 0//defined(CONFIG_SND_RK29_SOC_alc5631) || defined(CONFIG_SND_RK29_SOC_alc5621)
         rx_ctl = tx_ctl;
         rx_ctl &= ~I2S_MODE_MASK;   
         rx_ctl |= I2S_SLAVE_MODE;  // set tx slave, rx master
@@ -345,7 +345,7 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream,
 
         writel(dmarc, &(pheadi2s->I2S_DMACR));
         I2S_DBG("Enter %s, %d I2S_TXCR=0x%08X\n", __func__, __LINE__, iismod);  
-#if defined(CONFIG_SND_RK29_SOC_alc5631) || defined(CONFIG_SND_RK29_SOC_alc5621)
+#if 0//defined(CONFIG_SND_RK29_SOC_alc5631) || defined(CONFIG_SND_RK29_SOC_alc5621)
         dmarc = iismod;
         dmarc &= ~I2S_MODE_MASK;   
         dmarc |= I2S_SLAVE_MODE;     // set tx slave, rx master