6918ea2484
Update the 3.10 rasperry patches by rebasing raspberry/rpi-3.10-y against linux-stable/v3.10.49. Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 42678
77 lines
2 KiB
Diff
77 lines
2 KiB
Diff
From 2be2a87be13a5e4df2e3afb13a6089fcd7073906 Mon Sep 17 00:00:00 2001
|
|
From: popcornmix <popcornmix@gmail.com>
|
|
Date: Wed, 17 Apr 2013 12:16:36 +0100
|
|
Subject: [PATCH 035/196] Enable multiple ALSA channels
|
|
|
|
---
|
|
arch/arm/mach-bcm2708/bcm2708.c | 54 ++++++++++++++++++++++++++++++++++++-----
|
|
1 file changed, 48 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
|
|
index ab8bac6..5a7437b 100644
|
|
--- a/arch/arm/mach-bcm2708/bcm2708.c
|
|
+++ b/arch/arm/mach-bcm2708/bcm2708.c
|
|
@@ -471,12 +471,54 @@ struct platform_device bcm2708_powerman_device = {
|
|
|
|
|
|
static struct platform_device bcm2708_alsa_devices[] = {
|
|
- [0] = {
|
|
- .name = "bcm2835_AUD0",
|
|
- .id = 0, /* first audio device */
|
|
- .resource = 0,
|
|
- .num_resources = 0,
|
|
- },
|
|
+ [0] = {
|
|
+ .name = "bcm2835_AUD0",
|
|
+ .id = 0, /* first audio device */
|
|
+ .resource = 0,
|
|
+ .num_resources = 0,
|
|
+ },
|
|
+ [1] = {
|
|
+ .name = "bcm2835_AUD1",
|
|
+ .id = 1, /* second audio device */
|
|
+ .resource = 0,
|
|
+ .num_resources = 0,
|
|
+ },
|
|
+ [2] = {
|
|
+ .name = "bcm2835_AUD2",
|
|
+ .id = 2, /* third audio device */
|
|
+ .resource = 0,
|
|
+ .num_resources = 0,
|
|
+ },
|
|
+ [3] = {
|
|
+ .name = "bcm2835_AUD3",
|
|
+ .id = 3, /* forth audio device */
|
|
+ .resource = 0,
|
|
+ .num_resources = 0,
|
|
+ },
|
|
+ [4] = {
|
|
+ .name = "bcm2835_AUD4",
|
|
+ .id = 4, /* fifth audio device */
|
|
+ .resource = 0,
|
|
+ .num_resources = 0,
|
|
+ },
|
|
+ [5] = {
|
|
+ .name = "bcm2835_AUD5",
|
|
+ .id = 5, /* sixth audio device */
|
|
+ .resource = 0,
|
|
+ .num_resources = 0,
|
|
+ },
|
|
+ [6] = {
|
|
+ .name = "bcm2835_AUD6",
|
|
+ .id = 6, /* seventh audio device */
|
|
+ .resource = 0,
|
|
+ .num_resources = 0,
|
|
+ },
|
|
+ [7] = {
|
|
+ .name = "bcm2835_AUD7",
|
|
+ .id = 7, /* eighth audio device */
|
|
+ .resource = 0,
|
|
+ .num_resources = 0,
|
|
+ },
|
|
};
|
|
|
|
static struct resource bcm2708_spi_resources[] = {
|
|
--
|
|
1.9.1
|
|
|