diff options
Diffstat (limited to 'arch/arm/mach-omap1/devices.c')
-rw-r--r-- | arch/arm/mach-omap1/devices.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index aa0725608fb1..b583121b04b9 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <mach/gpio.h> | 25 | #include <mach/gpio.h> |
26 | #include <plat/mmc.h> | 26 | #include <plat/mmc.h> |
27 | #include <plat/omap7xx.h> | 27 | #include <plat/omap7xx.h> |
28 | #include <plat/mcbsp.h> | ||
28 | 29 | ||
29 | /*-------------------------------------------------------------------------*/ | 30 | /*-------------------------------------------------------------------------*/ |
30 | 31 | ||
@@ -195,6 +196,30 @@ static inline void omap_init_spi100k(void) | |||
195 | 196 | ||
196 | static inline void omap_init_sti(void) {} | 197 | static inline void omap_init_sti(void) {} |
197 | 198 | ||
199 | #if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE) | ||
200 | |||
201 | static struct platform_device omap_pcm = { | ||
202 | .name = "omap-pcm-audio", | ||
203 | .id = -1, | ||
204 | }; | ||
205 | |||
206 | OMAP_MCBSP_PLATFORM_DEVICE(1); | ||
207 | OMAP_MCBSP_PLATFORM_DEVICE(2); | ||
208 | OMAP_MCBSP_PLATFORM_DEVICE(3); | ||
209 | |||
210 | static void omap_init_audio(void) | ||
211 | { | ||
212 | platform_device_register(&omap_mcbsp1); | ||
213 | platform_device_register(&omap_mcbsp2); | ||
214 | if (!cpu_is_omap7xx()) | ||
215 | platform_device_register(&omap_mcbsp3); | ||
216 | platform_device_register(&omap_pcm); | ||
217 | } | ||
218 | |||
219 | #else | ||
220 | static inline void omap_init_audio(void) {} | ||
221 | #endif | ||
222 | |||
198 | /*-------------------------------------------------------------------------*/ | 223 | /*-------------------------------------------------------------------------*/ |
199 | 224 | ||
200 | /* | 225 | /* |
@@ -227,6 +252,7 @@ static int __init omap1_init_devices(void) | |||
227 | omap_init_rtc(); | 252 | omap_init_rtc(); |
228 | omap_init_spi100k(); | 253 | omap_init_spi100k(); |
229 | omap_init_sti(); | 254 | omap_init_sti(); |
255 | omap_init_audio(); | ||
230 | 256 | ||
231 | return 0; | 257 | return 0; |
232 | } | 258 | } |