i2s0再次修改:

1) i2s0的rx, tx两者都为master
  2) 硬件上针对只有一路LRCK的codec,例如alc5631/5621,只将I2S0_LRCK连接到codec的LRCK, I2S0_LRCK_RX直接断开
This commit is contained in:
胡卫国
2011-09-20 11:58:17 +08:00
parent 2af0590a3c
commit 3282ee6dd3

View File

@@ -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