From 2830934c57e6fef148a4658f6cd4638dea392db6 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Fri, 3 Apr 2009 14:39:05 +0300 Subject: [PATCH] --- yaml --- r: 142699 b: refs/heads/master c: 103f211d0be2bed75b5739de62a10415ef0bbc25 h: refs/heads/master i: 142697: ad15ad5bfa92f02fb3be18e3c46d0893d865be55 142695: 8406ea1ecd72f5afe6051ca9f0d711be6ad33420 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/twl4030.c | 3 +++ trunk/sound/soc/codecs/twl4030.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c8bf36d665a0..5caa8637dabd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a11b16853b642a26eb248ac4db422e6dfa04ae5 +refs/heads/master: 103f211d0be2bed75b5739de62a10415ef0bbc25 diff --git a/trunk/sound/soc/codecs/twl4030.c b/trunk/sound/soc/codecs/twl4030.c index 4199498a8918..bfda7a88e825 100644 --- a/trunk/sound/soc/codecs/twl4030.c +++ b/trunk/sound/soc/codecs/twl4030.c @@ -1311,6 +1311,9 @@ static int twl4030_hw_params(struct snd_pcm_substream *substream, case 48000: mode |= TWL4030_APLL_RATE_48000; break; + case 96000: + mode |= TWL4030_APLL_RATE_96000; + break; default: printk(KERN_ERR "TWL4030 hw params: unknown rate %d\n", params_rate(params)); diff --git a/trunk/sound/soc/codecs/twl4030.h b/trunk/sound/soc/codecs/twl4030.h index 33dbb144dad1..cb63765db1df 100644 --- a/trunk/sound/soc/codecs/twl4030.h +++ b/trunk/sound/soc/codecs/twl4030.h @@ -109,6 +109,7 @@ #define TWL4030_APLL_RATE_32000 0x80 #define TWL4030_APLL_RATE_44100 0x90 #define TWL4030_APLL_RATE_48000 0xA0 +#define TWL4030_APLL_RATE_96000 0xE0 #define TWL4030_SEL_16K 0x04 #define TWL4030_CODECPDZ 0x02 #define TWL4030_OPT_MODE 0x01