From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
To: broonie@opensource.wolfsonmicro.com
Cc: alsa-devel@alsa-project.org, tiwai@suse.de,
patches@opensource.wolfsonmicro.com, lgirdwood@gmail.com,
Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Subject: [PATCH 8/8] ASoC: arizona: Add convience define for clearing SYNCCLK
Date: Wed, 20 Feb 2013 16:09:39 +0000 [thread overview]
Message-ID: <1361376579-29051-9-git-send-email-ckeepax@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1361376579-29051-1-git-send-email-ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
sound/soc/codecs/arizona.c | 8 ++++----
sound/soc/codecs/arizona.h | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index b12a489..6a00904 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -1185,7 +1185,7 @@ int arizona_set_fll(struct arizona_fll *fll, int source,
int ret;
if (fll->ref_src < 0 || fll->ref_src == source) {
- if (fll->sync_src == -1 &&
+ if (fll->sync_src == ARIZONA_FLL_SRC_NONE &&
fll->ref_src == source && fll->ref_freq == Fref &&
fll->fout == Fout)
return 0;
@@ -1196,7 +1196,7 @@ int arizona_set_fll(struct arizona_fll *fll, int source,
return ret;
}
- fll->sync_src = -1;
+ fll->sync_src = ARIZONA_FLL_SRC_NONE;
fll->ref_src = source;
fll->ref_freq = Fref;
} else if (fll->ref_src != source) {
@@ -1240,7 +1240,7 @@ int arizona_init_fll(struct arizona *arizona, int id, int base, int lock_irq,
fll->id = id;
fll->base = base;
fll->arizona = arizona;
- fll->sync_src = -1;
+ fll->sync_src = ARIZONA_FLL_SRC_NONE;
/* Configure default refclk to 32kHz if we have one */
regmap_read(arizona->regmap, ARIZONA_CLOCK_32K_1, &val);
@@ -1250,7 +1250,7 @@ int arizona_init_fll(struct arizona *arizona, int id, int base, int lock_irq,
fll->ref_src = val & ARIZONA_CLK_32K_SRC_MASK;
break;
default:
- fll->ref_src = -1;
+ fll->ref_src = ARIZONA_FLL_SRC_NONE;
}
fll->ref_freq = 32768;
diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h
index f2ca41f..3f84943 100644
--- a/sound/soc/codecs/arizona.h
+++ b/sound/soc/codecs/arizona.h
@@ -32,6 +32,7 @@
#define ARIZONA_CLK_SRC_AIF2BCLK 0x9
#define ARIZONA_CLK_SRC_AIF3BCLK 0xa
+#define ARIZONA_FLL_SRC_NONE -1
#define ARIZONA_FLL_SRC_MCLK1 0
#define ARIZONA_FLL_SRC_MCLK2 1
#define ARIZONA_FLL_SRC_SLIMCLK 3
--
1.7.2.5
next prev parent reply other threads:[~2013-02-20 16:12 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-20 16:09 [PATCH 0/8] ASoC: arizona: Add support for directly setting the FLL REFCLK Charles Keepax
2013-02-20 16:09 ` [PATCH 1/8] ASoC: arizona: Move selection of FLL REFCLK into init Charles Keepax
2013-02-20 16:09 ` [PATCH 2/8] ASoC: arizona: Tidy up SYNCCLK selection and cache values Charles Keepax
2013-02-20 16:31 ` Mark Brown
2013-02-20 16:53 ` Charles Keepax
2013-02-20 16:09 ` [PATCH 3/8] ASoC: arizona: Factor out check for enabled FLL Charles Keepax
2013-02-20 16:09 ` [PATCH 4/8] ASoC: arizona: Factor out FLL disable Charles Keepax
2013-02-20 16:09 ` [PATCH 5/8] ASoC: arizona: Factor out FLL enable Charles Keepax
2013-02-20 16:09 ` [PATCH 6/8] ASoC: arizona: Improve suppression of noop FLL updates Charles Keepax
2013-02-20 16:09 ` [PATCH 7/8] ASoC: arizona: Add support for directly setting the FLL REFCLK Charles Keepax
2013-02-20 16:09 ` Charles Keepax [this message]
2013-02-20 16:44 ` [PATCH 0/8] " Mark Brown
2013-02-20 17:22 ` Charles Keepax
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=1361376579-29051-9-git-send-email-ckeepax@opensource.wolfsonmicro.com \
--to=ckeepax@opensource.wolfsonmicro.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lgirdwood@gmail.com \
--cc=patches@opensource.wolfsonmicro.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.