From: Axel Lin <axel.lin@ingics.com>
To: Mark Brown <broonie@kernel.org>
Cc: Brian Austin <brian.austin@cirrus.com>,
"alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Paul Handrigan <Paul.Handrigan@cirrus.com>
Subject: [PATCH] ASoC: cs35l32: Simplify implementation of cs35l32_codec_set_sysclk
Date: Thu, 28 Aug 2014 16:27:56 +0800 [thread overview]
Message-ID: <1409214476.21395.2.camel@phoenix> (raw)
Use single snd_soc_update_bits() call to update the register bits.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
sound/soc/codecs/cs35l32.c | 28 +++++++---------------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/sound/soc/codecs/cs35l32.c b/sound/soc/codecs/cs35l32.c
index 9c6b272..380c212 100644
--- a/sound/soc/codecs/cs35l32.c
+++ b/sound/soc/codecs/cs35l32.c
@@ -242,41 +242,27 @@ static struct snd_soc_dai_driver cs35l32_dai[] = {
static int cs35l32_codec_set_sysclk(struct snd_soc_codec *codec,
int clk_id, int source, unsigned int freq, int dir)
{
+ unsigned int val;
switch (freq) {
case 6000000:
- snd_soc_update_bits(codec, CS35L32_CLK_CTL,
- CS35L32_MCLK_DIV2_MASK, 0);
- snd_soc_update_bits(codec, CS35L32_CLK_CTL,
- CS35L32_MCLK_RATIO_MASK,
- CS35L32_MCLK_RATIO);
+ val = CS35L32_MCLK_RATIO;
break;
case 12000000:
- snd_soc_update_bits(codec, CS35L32_CLK_CTL,
- CS35L32_MCLK_DIV2_MASK,
- CS35L32_MCLK_DIV2_MASK);
- snd_soc_update_bits(codec, CS35L32_CLK_CTL,
- CS35L32_MCLK_RATIO_MASK,
- CS35L32_MCLK_RATIO);
+ val = CS35L32_MCLK_DIV2_MASK | CS35L32_MCLK_RATIO;
break;
case 6144000:
- snd_soc_update_bits(codec, CS35L32_CLK_CTL,
- CS35L32_MCLK_DIV2_MASK, 0);
- snd_soc_update_bits(codec, CS35L32_CLK_CTL,
- CS35L32_MCLK_RATIO_MASK, 0);
+ val = 0;
break;
case 12288000:
- snd_soc_update_bits(codec, CS35L32_CLK_CTL,
- CS35L32_MCLK_DIV2_MASK,
- CS35L32_MCLK_DIV2_MASK);
- snd_soc_update_bits(codec, CS35L32_CLK_CTL,
- CS35L32_MCLK_RATIO_MASK, 0);
+ val = CS35L32_MCLK_DIV2_MASK;
break;
default:
return -EINVAL;
}
- return 0;
+ return snd_soc_update_bits(codec, CS35L32_CLK_CTL,
+ CS35L32_MCLK_DIV2_MASK | CS35L32_MCLK_RATIO_MASK, val);
}
static struct snd_soc_codec_driver soc_codec_dev_cs35l32 = {
--
1.9.1
next reply other threads:[~2014-08-28 8:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-28 8:27 Axel Lin [this message]
2014-08-28 15:08 ` [PATCH] ASoC: cs35l32: Simplify implementation of cs35l32_codec_set_sysclk Brian Austin
2014-08-28 18:14 ` 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=1409214476.21395.2.camel@phoenix \
--to=axel.lin@ingics.com \
--cc=Paul.Handrigan@cirrus.com \
--cc=alsa-devel@alsa-project.org \
--cc=brian.austin@cirrus.com \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
/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