diff options
| author | Mark Brown | 2015-11-19 18:48:23 +0100 |
|---|---|---|
| committer | Mark Brown | 2015-11-19 18:48:23 +0100 |
| commit | a24c602546fbec01105819333d67191d1ca0e15d (patch) | |
| tree | 82d74d3706b48f3911c30598738ac0a00d964fe7 | |
| parent | ASoC: wm8998: Remove duplicated consts (diff) | |
| parent | ASoC: arizona: fix range of OPCLK_REF (diff) | |
| download | kernel-qcow2-linux-a24c602546fbec01105819333d67191d1ca0e15d.tar.gz kernel-qcow2-linux-a24c602546fbec01105819333d67191d1ca0e15d.tar.xz kernel-qcow2-linux-a24c602546fbec01105819333d67191d1ca0e15d.zip | |
Merge branch 'fix/arizona' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-arizona
| -rw-r--r-- | sound/soc/codecs/arizona.c | 16 |
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) { |