summaryrefslogtreecommitdiffstats
path: root/sound/arm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-12-18 17:48:45 +0000
committerTakashi Iwai <tiwai@suse.de>2009-12-18 20:31:01 +0100
commita08d56583f6b87e2981d1b6e9ee891bdc741cc44 (patch)
tree4fdc8eeaee76f0bb4d7f78b1e3d36717142ab28c /sound/arm
parentd3aee7996c30f928bbbbfd0994148e35d2e83084 (diff)
downloadlinux-a08d56583f6b87e2981d1b6e9ee891bdc741cc44.tar.gz
linux-a08d56583f6b87e2981d1b6e9ee891bdc741cc44.tar.bz2
linux-a08d56583f6b87e2981d1b6e9ee891bdc741cc44.zip
ALSA: AACI: add double-rate support
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/arm')
-rw-r--r--sound/arm/aaci.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index b88bbded2f4f..b377370af2d7 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -366,6 +366,10 @@ static int __aaci_pcm_open(struct aaci *aaci,
runtime->hw.rates = aacirun->pcm->rates;
snd_pcm_limit_hw_rates(runtime);
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
+ aacirun->pcm->r[1].slots)
+ snd_ac97_pcm_double_rate_rules(runtime);
+
/*
* FIXME: ALSA specifies fifo_size in bytes. If we're in normal
* mode, each 32-bit word contains one sample. If we're in
@@ -439,9 +443,12 @@ static int aaci_pcm_hw_params(struct snd_pcm_substream *substream,
err = snd_pcm_lib_malloc_pages(substream,
params_buffer_bytes(params));
if (err >= 0) {
- err = snd_ac97_pcm_open(aacirun->pcm, params_rate(params),
+ unsigned int rate = params_rate(params);
+ int dbl = rate > 48000;
+
+ err = snd_ac97_pcm_open(aacirun->pcm, rate,
params_channels(params),
- aacirun->pcm->r[0].slots);
+ aacirun->pcm->r[dbl].slots);
aacirun->pcm_open = err == 0;
aacirun->cr = CR_FEN | CR_COMPACT | CR_SZ16;
@@ -808,6 +815,12 @@ static struct ac97_pcm ac97_defs[] __devinitdata = {
(1 << AC97_SLOT_PCM_SRIGHT) |
(1 << AC97_SLOT_LFE),
},
+ [1] = {
+ .slots = (1 << AC97_SLOT_PCM_LEFT) |
+ (1 << AC97_SLOT_PCM_RIGHT) |
+ (1 << AC97_SLOT_PCM_LEFT_0) |
+ (1 << AC97_SLOT_PCM_RIGHT_0),
+ },
},
},
[1] = { /* PCM in */