| Message ID | 1410568863-21723-1-git-send-email-jay.xu@rock-chips.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 07833d88314c496f8a136c6e4b4729c69e65b878 |
| Headers | show |
On Sat, Sep 13, 2014 at 08:41:03AM +0800, Jianqun wrote: > Fix error format set to I2S master or slave mode. > Test on RK3288 board with max98090. Applied. Since this is a bug fix it should be one of the first patches in the series so that it can be sent to Linus as a fix, bug fixes should go before any other patches.
? 09/14/2014 12:35 AM, Mark Brown ??: > On Sat, Sep 13, 2014 at 08:41:03AM +0800, Jianqun wrote: >> Fix error format set to I2S master or slave mode. >> Test on RK3288 board with max98090. > > Applied. Since this is a bug fix it should be one of the first patches > in the series so that it can be sent to Linus as a fix, bug fixes should > go before any other patches. > got it, I'll do it at new version patch, thanks
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 8d8e4b5..870a664 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -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;
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> --- sound/soc/rockchip/rockchip_i2s.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)