aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@nokia.com>2008-02-20 17:13:44 +0100
committerTakashi Iwai <tiwai@suse.de>2008-04-24 12:00:13 +0200
commit6876a5323f6169f9321354a398f7364b41ca82fa (patch)
tree2e85726835b544a0a6b7d93a8d5aa64c6e302d4d /sound/soc/codecs
parent9e235323db4689e8b7e123252b998a4904806c38 (diff)
downloadkernel_goldelico_gta04-6876a5323f6169f9321354a398f7364b41ca82fa.zip
kernel_goldelico_gta04-6876a5323f6169f9321354a398f7364b41ca82fa.tar.gz
kernel_goldelico_gta04-6876a5323f6169f9321354a398f7364b41ca82fa.tar.bz2
[ALSA] ASoC: Add support for 12 MHz MCLK in TLV320AIC3X
Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/tlv320aic3x.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 889a897..e6a730b 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -660,33 +660,43 @@ struct aic3x_rate_divs {
/* AIC3X codec mclk clock divider coefficients */
static const struct aic3x_rate_divs aic3x_divs[] = {
/* 8k */
+ {12000000, 8000, 48000, 0xa, 16, 3840},
{22579200, 8000, 48000, 0xa, 8, 7075},
{33868800, 8000, 48000, 0xa, 5, 8049},
/* 11.025k */
+ {12000000, 11025, 44100, 0x6, 15, 528},
{22579200, 11025, 44100, 0x6, 8, 0},
{33868800, 11025, 44100, 0x6, 5, 3333},
/* 16k */
+ {12000000, 16000, 48000, 0x4, 16, 3840},
{22579200, 16000, 48000, 0x4, 8, 7075},
{33868800, 16000, 48000, 0x4, 5, 8049},
/* 22.05k */
+ {12000000, 22050, 44100, 0x2, 15, 528},
{22579200, 22050, 44100, 0x2, 8, 0},
{33868800, 22050, 44100, 0x2, 5, 3333},
/* 32k */
+ {12000000, 32000, 48000, 0x1, 16, 3840},
{22579200, 32000, 48000, 0x1, 8, 7075},
{33868800, 32000, 48000, 0x1, 5, 8049},
/* 44.1k */
+ {12000000, 44100, 44100, 0x0, 15, 528},
{22579200, 44100, 44100, 0x0, 8, 0},
{33868800, 44100, 44100, 0x0, 5, 3333},
/* 48k */
+ {12000000, 48000, 48000, 0x0, 16, 3840},
{22579200, 48000, 48000, 0x0, 8, 7075},
{33868800, 48000, 48000, 0x0, 5, 8049},
/* 64k */
+ {12000000, 64000, 96000, 0x1, 16, 3840},
{22579200, 64000, 96000, 0x1, 8, 7075},
{33868800, 64000, 96000, 0x1, 5, 8049},
/* 88.2k */
+ {12000000, 88200, 88200, 0x0, 15, 528},
{22579200, 88200, 88200, 0x0, 8, 0},
{33868800, 88200, 88200, 0x0, 5, 3333},
/* 96k */
+ {12000000, 96000, 96000, 0x0, 16, 3840},
{22579200, 96000, 96000, 0x0, 8, 7075},
{33868800, 96000, 96000, 0x0, 5, 8049},
};
@@ -807,6 +817,7 @@ static int aic3x_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai,
struct aic3x_priv *aic3x = codec->private_data;
switch (freq) {
+ case 12000000:
case 22579200:
case 33868800:
aic3x->sysclk = freq;