From: Jianqun <jay.xu@rock-chips.com>
To: heiko@sntech.de, lgirdwood@gmail.com, broonie@kernel.org,
perex@perex.cz, tiwai@suse.de,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org,
alsa-devel@alsa-project.org
Cc: huangtao@rock-chips.com, cf@rock-chips.com,
Jianqun <jay.xu@rock-chips.com>
Subject: [PATCH 2/5] ASoC: rockchip-i2s: fix master mode set bit error
Date: Sat, 13 Sep 2014 08:41:03 +0800 [thread overview]
Message-ID: <1410568863-21723-1-git-send-email-jay.xu@rock-chips.com> (raw)
In-Reply-To: <1410568723-21559-1-git-send-email-jay.xu@rock-chips.com>
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(-)
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;
--
1.9.1
next prev parent reply other threads:[~2014-09-13 0:41 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-13 0:38 [PATCH 0/5] ASoC: rockchip-i2s: patches for rockchip i2s driver Jianqun
2014-09-13 0:40 ` [PATCH 1/5] ASoC: rockchip-i2s: fix rockchip i2s defination more reasonable Jianqun
2014-09-13 16:38 ` Mark Brown
2014-09-13 0:41 ` Jianqun [this message]
2014-09-13 16:35 ` [PATCH 2/5] ASoC: rockchip-i2s: fix master mode set bit error Mark Brown
2014-09-14 2:06 ` Jianqun
2014-09-13 0:41 ` [PATCH 3/5] ASoC: rockchip-i2s: add dma data to snd_soc_dai Jianqun
2014-09-13 16:38 ` Mark Brown
2014-09-13 0:42 ` [PATCH 4/5] ASoC: rockchip-i2s: fix registers' property of rockchip i2s controller Jianqun
2014-09-13 16:36 ` Mark Brown
2014-09-14 2:20 ` Jianqun
2014-09-13 20:57 ` Sergei Shtylyov
2014-09-14 2:29 ` Jianqun
2014-09-14 18:53 ` Sergei Shtylyov
2014-09-13 0:43 ` [PATCH 5/5] ASoC: rockchip-i2s: enable "hclk" for rockchip I2S controller Jianqun
2014-09-13 16:36 ` Mark Brown
2014-09-14 2:24 ` Jianqun
2014-09-13 16:37 ` Mark Brown
2014-09-14 2:27 ` Jianqun
2014-09-15 16:54 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1410568863-21723-1-git-send-email-jay.xu@rock-chips.com \
--to=jay.xu@rock-chips.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=cf@rock-chips.com \
--cc=heiko@sntech.de \
--cc=huangtao@rock-chips.com \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).