blob: 3ead12f95a86264f54a936fae73509b1d31b1d1c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
From 4c6d34d18fc383f09c4c1df84b85fe910d97d5e8 Mon Sep 17 00:00:00 2001
From: David Anders <x0132446@ti.com>
Date: Fri, 13 Aug 2010 09:21:15 -0500
Subject: [PATCH 17/60] ASoC: sdp4430: Share audio with Panda
commit a02d40978185ccb0f784ce116da302aa43889cc7 upstream
Add support to share the sdp4430 audio configuration with Panda.
Change-Id: Ib4ae39edd507e2850bcda1c67eb8c338fe690482
Signed-off-by: David Anders <x0132446@ti.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Margarita Olaya Cabrera <magi.olaya@ti.com>
Integrated-by: Jingdong Lu <jingdong.lu@windriver.com>
---
sound/soc/omap/Kconfig | 7 ++++---
sound/soc/omap/sdp4430.c | 4 +++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index 0ee3104..325733f 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -101,8 +101,9 @@ config SND_OMAP_SOC_SDP3430
SDP3430.
config SND_OMAP_SOC_SDP4430
- tristate "SoC Audio support for Texas Instruments SDP4430"
- depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP_4430SDP
+ tristate "SoC Audio support for Texas Instruments SDP4430 or PandaBoard"
+ depends on (MACH_OMAP_4430SDP || MACH_OMAP4_PANDA)
+ depends on TWL4030_CORE && SND_OMAP_SOC
select SND_OMAP_SOC_ABE
select SND_OMAP_SOC_MCPDM
select SND_SOC_TWL6040
@@ -112,7 +113,7 @@ config SND_OMAP_SOC_SDP4430
select SND_OMAP_SOC_ABE_DSP
help
Say Y if you want to add support for SoC audio on Texas Instruments
- SDP4430.
+ SDP4430 or PandaBoard.
config SND_OMAP_SOC_OMAP3_PANDORA
tristate "SoC Audio support for OMAP3 Pandora"
diff --git a/sound/soc/omap/sdp4430.c b/sound/soc/omap/sdp4430.c
index 44cceb8..809f5fc 100644
--- a/sound/soc/omap/sdp4430.c
+++ b/sound/soc/omap/sdp4430.c
@@ -719,8 +719,10 @@ static int __init sdp4430_soc_init(void)
{
int ret;
- if (!machine_is_omap_4430sdp())
+ if (!machine_is_omap_4430sdp() && !machine_is_omap4_panda()) {
+ pr_debug("Not SDP4430 or PandaBoard!\n");
return -ENODEV;
+ }
printk(KERN_INFO "SDP4430 SoC init\n");
sdp4430_snd_device = platform_device_alloc("soc-audio", -1);
--
1.7.4.1
|
