diff options
| author | David Anders <x0132446@ti.com> | 2011-04-07 08:39:26 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-04-07 08:39:26 +0100 |
| commit | c34f452d3c684687ef0bdc84026e59ce4d2e675c (patch) | |
| tree | c2fbd68c0a94b7ca6286a9974cacc561ca13c13b /sound/soc | |
| parent | fc644ceee1d1612448810979ce58610409dd6239 (diff) | |
ASoC: sdp4430: Share audio with Panda
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>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/omap/Kconfig | 7 | ||||
| -rw-r--r-- | 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 2d75d9472fa..9b716ae0d3c 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -108,8 +108,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 @@ -119,7 +120,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 44cceb8dd94..809f5fc7370 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); |