mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
62b7f5931c
bcm2708: boot tested on RPi B+ v1.2
bcm2709: boot tested on RPi 3B v1.2 and RPi 4B v1.1 4G
bcm2710: boot tested on RPi 3B v1.2
bcm2711: boot tested on RPi 4B v1.1 4G
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
(cherry-picked from commit f07e572f64)
56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
From 88bddc0f26024c64e1e17562dea77d8a50e1f1d0 Mon Sep 17 00:00:00 2001
|
|
From: Dom Cobley <popcornmix@gmail.com>
|
|
Date: Tue, 27 Oct 2020 12:24:14 +0000
|
|
Subject: [PATCH] bcm2835-pcm: Fix up multichannel pcm audio
|
|
|
|
Fixes: a9c1660ff5f02d048c5f31abf1fd1108ccf9ef87
|
|
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
|
|
---
|
|
.../vc04_services/bcm2835-audio/bcm2835-pcm.c | 21 +++++++++----------
|
|
1 file changed, 10 insertions(+), 11 deletions(-)
|
|
|
|
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
|
|
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
|
|
@@ -14,14 +14,14 @@ static const struct snd_pcm_hardware snd
|
|
SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
|
|
SNDRV_PCM_INFO_SYNC_APPLPTR),
|
|
.formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
|
|
- .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_192000,
|
|
+ .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_192000,
|
|
.rate_min = 8000,
|
|
.rate_max = 192000,
|
|
.channels_min = 1,
|
|
- .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,
|
|
};
|
|
@@ -31,16 +31,15 @@ static const struct snd_pcm_hardware snd
|
|
SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
|
|
SNDRV_PCM_INFO_SYNC_APPLPTR),
|
|
.formats = SNDRV_PCM_FMTBIT_S16_LE,
|
|
- .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,
|
|
+ .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_44100 |
|
|
+ SNDRV_PCM_RATE_48000,
|
|
.rate_min = 44100,
|
|
- .rate_max = 192000,
|
|
+ .rate_max = 48000,
|
|
.channels_min = 2,
|
|
- .channels_max = 8,
|
|
- .buffer_bytes_max = 512 * 1024,
|
|
+ .channels_max = 2,
|
|
+ .buffer_bytes_max = 128 * 1024,
|
|
.period_bytes_min = 1 * 1024,
|
|
- .period_bytes_max = 512 * 1024,
|
|
+ .period_bytes_max = 128 * 1024,
|
|
.periods_min = 1,
|
|
.periods_max = 128,
|
|
};
|