diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 11:32:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 11:32:05 -0400 |
commit | 33081adf8b89d5a716d7e1c60171768d39795b39 (patch) | |
tree | 275de58bbbb5f7ddffcdc087844cfc7fbe4315be /arch/arm/mach-omap2/devices.c | |
parent | c55960499f810357a29659b32d6ea594abee9237 (diff) | |
parent | 506ecbca71d07fa327dd986be1682e90885678ee (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (365 commits)
ALSA: hda - Disable sticky PCM stream assignment for AD codecs
ALSA: usb - Creative USB X-Fi volume knob support
ALSA: ca0106: Use card specific dac id for mute controls.
ALSA: ca0106: Allow different sound cards to use different SPI channel mappings.
ALSA: ca0106: Create a nice spot for mapping channels to dacs.
ALSA: ca0106: Move enabling of front dac out of hardcoded setup sequence.
ALSA: ca0106: Pull out dac powering routine into separate function.
ALSA: ca0106 - add Sound Blaster 5.1vx info.
ASoC: tlv320dac33: Use usleep_range for delays
ALSA: usb-audio: add Novation Launchpad support
ALSA: hda - Add workarounds for CT-IBG controllers
ALSA: hda - Fix wrong TLV mute bit for STAC/IDT codecs
ASoC: tpa6130a2: Error handling for broken chip
ASoC: max98088: Staticise m98088_eq_band
ASoC: soc-core: Fix codec->name memory leak
ALSA: hda - Apply ideapad quirk to Acer laptops with Cxt5066
ALSA: hda - Add some workarounds for Creative IBG
ALSA: hda - Fix wrong SPDIF NID assignment for CA0110
ALSA: hda - Fix codec rename rules for ALC662-compatible codecs
ALSA: hda - Add alc_init_jacks() call to other codecs
...
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index b27e7cbb3f29..c5cf1ba08a6f 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <plat/control.h> | 25 | #include <plat/control.h> |
26 | #include <plat/tc.h> | 26 | #include <plat/tc.h> |
27 | #include <plat/board.h> | 27 | #include <plat/board.h> |
28 | #include <plat/mcbsp.h> | ||
28 | #include <mach/gpio.h> | 29 | #include <mach/gpio.h> |
29 | #include <plat/mmc.h> | 30 | #include <plat/mmc.h> |
30 | #include <plat/dma.h> | 31 | #include <plat/dma.h> |
@@ -235,6 +236,43 @@ static inline void omap_init_mbox(void) { } | |||
235 | 236 | ||
236 | static inline void omap_init_sti(void) {} | 237 | static inline void omap_init_sti(void) {} |
237 | 238 | ||
239 | #if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE) | ||
240 | |||
241 | static struct platform_device omap_pcm = { | ||
242 | .name = "omap-pcm-audio", | ||
243 | .id = -1, | ||
244 | }; | ||
245 | |||
246 | /* | ||
247 | * OMAP2420 has 2 McBSP ports | ||
248 | * OMAP2430 has 5 McBSP ports | ||
249 | * OMAP3 has 5 McBSP ports | ||
250 | * OMAP4 has 4 McBSP ports | ||
251 | */ | ||
252 | OMAP_MCBSP_PLATFORM_DEVICE(1); | ||
253 | OMAP_MCBSP_PLATFORM_DEVICE(2); | ||
254 | OMAP_MCBSP_PLATFORM_DEVICE(3); | ||
255 | OMAP_MCBSP_PLATFORM_DEVICE(4); | ||
256 | OMAP_MCBSP_PLATFORM_DEVICE(5); | ||
257 | |||
258 | static void omap_init_audio(void) | ||
259 | { | ||
260 | platform_device_register(&omap_mcbsp1); | ||
261 | platform_device_register(&omap_mcbsp2); | ||
262 | if (cpu_is_omap243x() || cpu_is_omap34xx() || cpu_is_omap44xx()) { | ||
263 | platform_device_register(&omap_mcbsp3); | ||
264 | platform_device_register(&omap_mcbsp4); | ||
265 | } | ||
266 | if (cpu_is_omap243x() || cpu_is_omap34xx()) | ||
267 | platform_device_register(&omap_mcbsp5); | ||
268 | |||
269 | platform_device_register(&omap_pcm); | ||
270 | } | ||
271 | |||
272 | #else | ||
273 | static inline void omap_init_audio(void) {} | ||
274 | #endif | ||
275 | |||
238 | #if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE) | 276 | #if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE) |
239 | 277 | ||
240 | #include <plat/mcspi.h> | 278 | #include <plat/mcspi.h> |
@@ -917,6 +955,7 @@ static int __init omap2_init_devices(void) | |||
917 | * in alphabetical order so they're easier to sort through. | 955 | * in alphabetical order so they're easier to sort through. |
918 | */ | 956 | */ |
919 | omap_hsmmc_reset(); | 957 | omap_hsmmc_reset(); |
958 | omap_init_audio(); | ||
920 | omap_init_camera(); | 959 | omap_init_camera(); |
921 | omap_init_mbox(); | 960 | omap_init_mbox(); |
922 | omap_init_mcspi(); | 961 | omap_init_mcspi(); |