summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-11-25 17:57:46 +0000
committerMark Brown <broonie@kernel.org>2015-11-25 17:57:46 +0000
commitdfc956d8ee0b84eaba29434b7e5699bd81fed684 (patch)
tree29697bc11c79a28d933c8fd362126f7dbcab24b3 /sound
parent1ec218373b8ebda821aec00bb156a9c94fad9cd4 (diff)
parent341604ad839d10314af51669fd454dc0aa2ef288 (diff)
downloadlinux-stable-dfc956d8ee0b84eaba29434b7e5699bd81fed684.tar.gz
linux-stable-dfc956d8ee0b84eaba29434b7e5699bd81fed684.tar.bz2
linux-stable-dfc956d8ee0b84eaba29434b7e5699bd81fed684.zip
Merge remote-tracking branch 'asoc/fix/arizona' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/arizona.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 9929efc6b9aa..b3ea24d64c50 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -1023,24 +1023,18 @@ void arizona_init_dvfs(struct arizona_priv *priv)
}
EXPORT_SYMBOL_GPL(arizona_init_dvfs);
-static unsigned int arizona_sysclk_48k_rates[] = {
+static unsigned int arizona_opclk_ref_48k_rates[] = {
6144000,
12288000,
24576000,
49152000,
- 73728000,
- 98304000,
- 147456000,
};
-static unsigned int arizona_sysclk_44k1_rates[] = {
+static unsigned int arizona_opclk_ref_44k1_rates[] = {
5644800,
11289600,
22579200,
45158400,
- 67737600,
- 90316800,
- 135475200,
};
static int arizona_set_opclk(struct snd_soc_codec *codec, unsigned int clk,
@@ -1065,11 +1059,11 @@ static int arizona_set_opclk(struct snd_soc_codec *codec, unsigned int clk,
}
if (refclk % 8000)
- rates = arizona_sysclk_44k1_rates;
+ rates = arizona_opclk_ref_44k1_rates;
else
- rates = arizona_sysclk_48k_rates;
+ rates = arizona_opclk_ref_48k_rates;
- for (ref = 0; ref < ARRAY_SIZE(arizona_sysclk_48k_rates) &&
+ for (ref = 0; ref < ARRAY_SIZE(arizona_opclk_ref_48k_rates) &&
rates[ref] <= refclk; ref++) {
div = 1;
while (rates[ref] / div >= freq && div < 32) {