diff options
author | Thomas Weber <weber@corscience.de> | 2010-02-11 10:13:59 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-02-11 14:49:48 -0500 |
commit | 867af973a3b38f2a564d612326efd2694d931f30 (patch) | |
tree | b3617f8e6b24571702c03077fcb294424d1f0f1c /sound/soc/omap | |
parent | c6848bf566c7217a6090693ff5cc47091fa772f5 (diff) |
Add ASoC support for Devkit8000
This patch expands the omap3beagle sound soc for the
beagle board clone DevKit8000.
Signed-off-by: Thomas Weber <weber@corscience.de>
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/omap')
-rw-r--r-- | sound/soc/omap/Kconfig | 8 | ||||
-rw-r--r-- | sound/soc/omap/omap3beagle.c | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 61952aa6cd5a..18ebdc7d0a51 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig | |||
@@ -94,12 +94,14 @@ config SND_OMAP_SOC_OMAP3_PANDORA | |||
94 | Say Y if you want to add support for SoC audio on the OMAP3 Pandora. | 94 | Say Y if you want to add support for SoC audio on the OMAP3 Pandora. |
95 | 95 | ||
96 | config SND_OMAP_SOC_OMAP3_BEAGLE | 96 | config SND_OMAP_SOC_OMAP3_BEAGLE |
97 | tristate "SoC Audio support for OMAP3 Beagle" | 97 | tristate "SoC Audio support for OMAP3 Beagle and Devkit8000" |
98 | depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP3_BEAGLE | 98 | depends on TWL4030_CORE && SND_OMAP_SOC |
99 | depends on (MACH_OMAP3_BEAGLE || MACH_DEVKIT8000) | ||
99 | select SND_OMAP_SOC_MCBSP | 100 | select SND_OMAP_SOC_MCBSP |
100 | select SND_SOC_TWL4030 | 101 | select SND_SOC_TWL4030 |
101 | help | 102 | help |
102 | Say Y if you want to add support for SoC audio on the Beagleboard. | 103 | Say Y if you want to add support for SoC audio on the Beagleboard or |
104 | the clone Devkit8000. | ||
103 | 105 | ||
104 | config SND_OMAP_SOC_ZOOM2 | 106 | config SND_OMAP_SOC_ZOOM2 |
105 | tristate "SoC Audio support for Zoom2" | 107 | tristate "SoC Audio support for Zoom2" |
diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c index d88ad5ca526c..240e0975dd6a 100644 --- a/sound/soc/omap/omap3beagle.c +++ b/sound/soc/omap/omap3beagle.c | |||
@@ -117,11 +117,11 @@ static int __init omap3beagle_soc_init(void) | |||
117 | { | 117 | { |
118 | int ret; | 118 | int ret; |
119 | 119 | ||
120 | if (!machine_is_omap3_beagle()) { | 120 | if (!(machine_is_omap3_beagle() || machine_is_devkit8000())) { |
121 | pr_debug("Not OMAP3 Beagle!\n"); | 121 | pr_debug("Not OMAP3 Beagle or Devkit8000!\n"); |
122 | return -ENODEV; | 122 | return -ENODEV; |
123 | } | 123 | } |
124 | pr_info("OMAP3 Beagle SoC init\n"); | 124 | pr_info("OMAP3 Beagle/Devkit8000 SoC init\n"); |
125 | 125 | ||
126 | omap3beagle_snd_device = platform_device_alloc("soc-audio", -1); | 126 | omap3beagle_snd_device = platform_device_alloc("soc-audio", -1); |
127 | if (!omap3beagle_snd_device) { | 127 | if (!omap3beagle_snd_device) { |