diff options
author | Mike Rapoport <mike@compulab.co.il> | 2009-11-16 09:19:25 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-16 11:02:03 -0500 |
commit | 8df89bc35c188e389295eaf7917653f13c83ce70 (patch) | |
tree | 445aec225f69548124fc7905e0f47f809c608bb2 /sound | |
parent | 0a3f5e35aae43b20fef09fd800cf52cc9a2d61a8 (diff) |
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')
-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 | |||
43 | Say Y if you want to add support for SoC audio on osk5912. | 43 | Say Y if you want to add support for SoC audio on osk5912. |
44 | 44 | ||
45 | config SND_OMAP_SOC_OVERO | 45 | config SND_OMAP_SOC_OVERO |
46 | tristate "SoC Audio support for Gumstix Overo" | 46 | tristate "SoC Audio support for Gumstix Overo and CompuLab CM-T35" |
47 | depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OVERO | 47 | depends on TWL4030_CORE && SND_OMAP_SOC && (MACH_OVERO || MACH_CM_T35) |
48 | select SND_OMAP_SOC_MCBSP | 48 | select SND_OMAP_SOC_MCBSP |
49 | select SND_SOC_TWL4030 | 49 | select SND_SOC_TWL4030 |
50 | help | 50 | help |
51 | Say Y if you want to add support for SoC audio on the Gumstix Overo. | 51 | Say Y if you want to add support for SoC audio on the |
52 | Gumstix Overo or CompuLab CM-T35 | ||
52 | 53 | ||
53 | config SND_OMAP_SOC_OMAP2EVM | 54 | config SND_OMAP_SOC_OMAP2EVM |
54 | tristate "SoC Audio support for OMAP2EVM board" | 55 | 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) | |||
107 | { | 107 | { |
108 | int ret; | 108 | int ret; |
109 | 109 | ||
110 | if (!machine_is_overo()) { | 110 | if (!(machine_is_overo() || machine_is_cm_t35())) { |
111 | pr_debug("Not Overo!\n"); | 111 | pr_debug("Incomatible machine!\n"); |
112 | return -ENODEV; | 112 | return -ENODEV; |
113 | } | 113 | } |
114 | printk(KERN_INFO "overo SoC init\n"); | 114 | printk(KERN_INFO "overo SoC init\n"); |