summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/arizona.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-11-21 07:18:11 +0100
committerTakashi Iwai <tiwai@suse.de>2012-11-21 07:18:11 +0100
commit789e05275e90b637f2029375715e187fd8cabbf4 (patch)
treeac6f9626a60e81c8af28b11f67e09bde9e145f24 /sound/soc/codecs/arizona.c
parent2ea3c6a2c779e5a6487d2b436770232162dfbbe3 (diff)
parenta6366c519cead55ce537babce2271e3b2a1ccec9 (diff)
Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.7 The biggest batch of fixes here is the Kirkwood DMA fixes, plus a couple of other small fixes.
Diffstat (limited to 'sound/soc/codecs/arizona.c')
-rw-r--r--sound/soc/codecs/arizona.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index c03b65af3059..054967d8bac2 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -268,7 +268,7 @@ EXPORT_SYMBOL_GPL(arizona_out_ev);
static unsigned int arizona_sysclk_48k_rates[] = {
6144000,
12288000,
- 22579200,
+ 24576000,
49152000,
73728000,
98304000,
@@ -278,7 +278,7 @@ static unsigned int arizona_sysclk_48k_rates[] = {
static unsigned int arizona_sysclk_44k1_rates[] = {
5644800,
11289600,
- 24576000,
+ 22579200,
45158400,
67737600,
90316800,