diff options
| author | Mike Rapoport | 2009-11-16 15:19:25 +0100 |
|---|---|---|
| committer | Mark Brown | 2009-11-16 17:02:03 +0100 |
| commit | 8df89bc35c188e389295eaf7917653f13c83ce70 (patch) | |
| tree | 445aec225f69548124fc7905e0f47f809c608bb2 /sound/soc | |
| parent | ASoC: Remove redundant snd_soc_dapm_new_widgets() calls (diff) | |
| download | kernel-qcow2-linux-8df89bc35c188e389295eaf7917653f13c83ce70.tar.gz kernel-qcow2-linux-8df89bc35c188e389295eaf7917653f13c83ce70.tar.xz kernel-qcow2-linux-8df89bc35c188e389295eaf7917653f13c83ce70.zip | |
ASoC: OMAP: enable Overo driver for CM-T35
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Acked-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/omap/Kconfig | 7 | ||||
| -rw-r--r-- | sound/soc/omap/overo.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index bb5731a22bed..4dc6b15a852f 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -43,12 +43,13 @@ config SND_OMAP_SOC_OSK5912 Say Y if you want to add support for SoC audio on osk5912. config SND_OMAP_SOC_OVERO - tristate "SoC Audio support for Gumstix Overo" - depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OVERO + tristate "SoC Audio support for Gumstix Overo and CompuLab CM-T35" + depends on TWL4030_CORE && SND_OMAP_SOC && (MACH_OVERO || MACH_CM_T35) select SND_OMAP_SOC_MCBSP select SND_SOC_TWL4030 help - Say Y if you want to add support for SoC audio on the Gumstix Overo. + Say Y if you want to add support for SoC audio on the + Gumstix Overo or CompuLab CM-T35 config SND_OMAP_SOC_OMAP2EVM tristate "SoC Audio support for OMAP2EVM board" diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c index ec4f8fd8b3a2..97a4d6308bd6 100644 --- a/sound/soc/omap/overo.c +++ b/sound/soc/omap/overo.c @@ -107,8 +107,8 @@ static int __init overo_soc_init(void) { int ret; - if (!machine_is_overo()) { - pr_debug("Not Overo!\n"); + if (!(machine_is_overo() || machine_is_cm_t35())) { + pr_debug("Incomatible machine!\n"); return -ENODEV; } printk(KERN_INFO "overo SoC init\n"); |