summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Fitzgerald2015-12-16 18:06:24 +0100
committerMark Brown2015-12-16 20:17:50 +0100
commit3451eb485aee78f31a8dd127e3385f89946c813b (patch)
treec36930bbbae35bdcdaabeb813b327d947deb4b3f
parentASoC: arizona: Fix type of clock rate pointer in arizona_set_sysclk (diff)
downloadkernel-qcow2-linux-3451eb485aee78f31a8dd127e3385f89946c813b.tar.gz
kernel-qcow2-linux-3451eb485aee78f31a8dd127e3385f89946c813b.tar.xz
kernel-qcow2-linux-3451eb485aee78f31a8dd127e3385f89946c813b.zip
ASoC: arizona: In arizona_calc_fratio make new codecs the default case
This patch rearranges the switch statement in arizona_calc_fratio so that older codecs are the special cases, with the default case applying to newer codecs (WM8998 and later). This is preferable because it avoids having to patch new cases in every time a new codec is added. Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/arizona.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index d90b3c51019a..38a73e3da508 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -2020,18 +2020,18 @@ static int arizona_calc_fratio(struct arizona_fll *fll,
}
switch (fll->arizona->type) {
+ case WM5102:
+ case WM8997:
+ return init_ratio;
case WM5110:
case WM8280:
if (fll->arizona->rev < 3 || sync)
return init_ratio;
break;
- case WM8998:
- case WM1814:
+ default:
if (sync)
return init_ratio;
break;
- default:
- return init_ratio;
}
cfg->fratio = init_ratio - 1;