diff options
| author | David Anders <x0132446@ti.com> | 2011-05-31 09:23:03 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-05-31 11:04:32 +0100 |
| commit | 3c79a28bc37dea2217a4ff54632f1714ed09218f (patch) | |
| tree | 6a24e0487a3ecc61e7e935ba29e6628a57738ede /sound | |
| parent | ce2711c7259fce6c03b79d4e13eba035b370ca51 (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')
| -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 0b35ef38d83..fc10fe98de9 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_OMAP4_HDMI tristate "SoC Audio support for Texas Instruments SDP4430 or Panda HDMI port" diff --git a/sound/soc/omap/sdp4430.c b/sound/soc/omap/sdp4430.c index f4a457906c5..9c35d39d853 100644 --- a/sound/soc/omap/sdp4430.c +++ b/sound/soc/omap/sdp4430.c @@ -1053,8 +1053,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", |