summaryrefslogtreecommitdiff
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorHarry Hong <hhong@nvidia.com>2012-02-28 17:14:28 +0900
committerSimone Willett <swillett@nvidia.com>2012-02-28 21:05:30 -0800
commitf6408893291a49955656c0408c1de039399775a1 (patch)
tree1c344ca0fbbed19782f7a16312a105ccc69c8f9a /sound/soc/codecs
parenta9a927b516bf1c72ed8b256b295fe0990901abcd (diff)
asoc: codecs: support 26MHz mclk for aic326x codec
bug 940617 Change-Id: I83f43820761d0227d7a594123d22fe79089e2e15 Signed-off-by: Harry Hong <hhong@nvidia.com> Reviewed-on: http://git-master/r/86280 Reviewed-by: Scott Peterson <speterson@nvidia.com> Tested-by: Gerrit_Virtual_Submit
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/tlv320aic326x.c3
-rw-r--r--sound/soc/codecs/tlv320aic326x.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/tlv320aic326x.c b/sound/soc/codecs/tlv320aic326x.c
index c44159ce8e37..12201e4aa920 100644
--- a/sound/soc/codecs/tlv320aic326x.c
+++ b/sound/soc/codecs/tlv320aic326x.c
@@ -827,6 +827,8 @@ static const struct aic3262_rate_divs aic3262_divs[] = {
{{0, 60, 1}, {0, 61, 1} } },
{24000000, 48000, 1, 4, 960, 128, 4, 4, 128, 4, 4, 4,
{{0, 60, 1}, {0, 61, 1} } },
+ {26000000, 48000, 2, 7, 5618, 128, 8, 2, 128, 8, 2, 4,
+ {{0, 60, 1}, {0, 61, 1} } },
#endif
/*96k rate */
@@ -1478,6 +1480,7 @@ static int aic3262_multi_i2s_set_dai_sysclk(struct snd_soc_dai *codec_dai,
case AIC3262_FREQ_12000000:
case AIC3262_FREQ_12288000:
case AIC3262_FREQ_24000000:
+ case AIC3262_FREQ_26000000:
aic3262->sysclk = freq;
return 0;
break;
diff --git a/sound/soc/codecs/tlv320aic326x.h b/sound/soc/codecs/tlv320aic326x.h
index 82f1fb73e908..3e56d833da4c 100644
--- a/sound/soc/codecs/tlv320aic326x.h
+++ b/sound/soc/codecs/tlv320aic326x.h
@@ -64,6 +64,7 @@ page, so fix that before commenting this line*/
#define AIC3262_FREQ_12000000 12000000
#define AIC3262_FREQ_12288000 12288000
#define AIC3262_FREQ_24000000 24000000
+#define AIC3262_FREQ_26000000 26000000
/* Macro for enabling the Multi_I2S Support in Driver */
#define AIC3262_MULTI_I2S 1