2019-09-19 14:43:19 +00:00
|
|
|
From 69d7e7d0f958186a0f7667ebeefdb50d1c5c3bd3 Mon Sep 17 00:00:00 2001
|
2019-07-09 18:32:28 +00:00
|
|
|
From: popcornmix <popcornmix@gmail.com>
|
|
|
|
Date: Tue, 30 Apr 2019 19:15:30 +0100
|
2019-09-19 14:43:19 +00:00
|
|
|
Subject: [PATCH 539/806] bcm2835-pcm.c: Support multichannel audio
|
2019-07-09 18:32:28 +00:00
|
|
|
|
|
|
|
---
|
|
|
|
.../vc04_services/bcm2835-audio/bcm2835-pcm.c | 17 +++++++++--------
|
|
|
|
1 file changed, 9 insertions(+), 8 deletions(-)
|
|
|
|
|
|
|
|
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
|
|
|
|
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
|
|
|
|
@@ -14,9 +14,9 @@ static const struct snd_pcm_hardware snd
|
|
|
|
SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
|
|
|
|
SNDRV_PCM_INFO_DRAIN_TRIGGER | SNDRV_PCM_INFO_SYNC_APPLPTR),
|
|
|
|
.formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
|
|
|
|
- .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
|
|
|
|
+ .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_192000,
|
|
|
|
.rate_min = 8000,
|
|
|
|
- .rate_max = 48000,
|
|
|
|
+ .rate_max = 192000,
|
|
|
|
.channels_min = 1,
|
|
|
|
.channels_max = 2,
|
|
|
|
.buffer_bytes_max = 128 * 1024,
|
|
|
|
@@ -31,15 +31,16 @@ static const struct snd_pcm_hardware snd
|
|
|
|
SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
|
|
|
|
SNDRV_PCM_INFO_DRAIN_TRIGGER | SNDRV_PCM_INFO_SYNC_APPLPTR),
|
|
|
|
.formats = SNDRV_PCM_FMTBIT_S16_LE,
|
|
|
|
- .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_44100 |
|
|
|
|
- SNDRV_PCM_RATE_48000,
|
|
|
|
+ .rates = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |
|
|
|
|
+ SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 |
|
|
|
|
+ SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000,
|
|
|
|
.rate_min = 44100,
|
|
|
|
- .rate_max = 48000,
|
|
|
|
+ .rate_max = 192000,
|
|
|
|
.channels_min = 2,
|
|
|
|
- .channels_max = 2,
|
|
|
|
- .buffer_bytes_max = 128 * 1024,
|
|
|
|
+ .channels_max = 8,
|
|
|
|
+ .buffer_bytes_max = 512 * 1024,
|
|
|
|
.period_bytes_min = 1 * 1024,
|
|
|
|
- .period_bytes_max = 128 * 1024,
|
|
|
|
+ .period_bytes_max = 512 * 1024,
|
|
|
|
.periods_min = 1,
|
|
|
|
.periods_max = 128,
|
|
|
|
};
|