diff options
| author | Liam Girdwood <lrg@ti.com> | 2011-07-24 20:59:49 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-08-25 07:38:08 +0100 |
| commit | 499230f2182611505009e4284b86399d57a5123a (patch) | |
| tree | 6ef7d45886832833f4ef5cdbeb29aa6479c7d1f6 /sound | |
| parent | 618a0fd7494bf8fd4f0585137a732f501f0ed781 (diff) | |
Subject: [PATCH 089/104] ASoC: sdp4430 - add support for Pandaboard.
Signed-off-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/omap/Kconfig | 6 | ||||
| -rw-r--r-- | sound/soc/omap/sdp4430.c | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 61f3eaf0481..4393a164cf3 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -101,8 +101,8 @@ 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 TWL4030_CORE && (MACH_OMAP_4430SDP || MACH_OMAP4_PANDA) select SND_OMAP_SOC_MCPDM select SND_SOC_TWL6040 select SND_OMAP_SOC_ABE @@ -112,7 +112,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 e57b54a233d..283c42feb70 100644 --- a/sound/soc/omap/sdp4430.c +++ b/sound/soc/omap/sdp4430.c @@ -743,7 +743,8 @@ static struct snd_soc_dai_link sdp4430_dai[] = { /* Audio machine driver */ static struct snd_soc_card snd_soc_sdp4430 = { - .name = "SDP4430", + .driver_name = "OMAP4", + .long_name = "TI OMAP4 Board", .dai_link = sdp4430_dai, .num_links = ARRAY_SIZE(sdp4430_dai), }; @@ -755,9 +756,15 @@ 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"); + if (machine_is_omap_4430sdp()) + snd_soc_sdp4430.name = "SDP4430"; + else if (machine_is_omap4_panda()) + snd_soc_sdp4430.name = "Panda"; sdp4430_snd_device = platform_device_alloc("soc-audio", -1); if (!sdp4430_snd_device) { |