summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8797fbb)
raw | patch | inline | side by side (parent: 8797fbb)
author | Vaibhav Bedia <vaibhav.bedia@ti.com> | |
Mon, 2 Jan 2012 11:47:01 +0000 (17:17 +0530) | ||
committer | Vaibhav Hiremath <hvaibhav@ti.com> | |
Mon, 23 Jan 2012 19:14:44 +0000 (00:44 +0530) |
...since AM33XX doesn't have any instance of McBSP
Note: This needs to be merged with the commit
08037c12036110c79b8fa2adf486aefaee
(arm:omap:am33xx: Don't register non-existent...)
Signed-off-by: Vaibhav Bedia <vaibhav.bedia@ti.com>
Note: This needs to be merged with the commit
08037c12036110c79b8fa2adf486aefaee
(arm:omap:am33xx: Don't register non-existent...)
Signed-off-by: Vaibhav Bedia <vaibhav.bedia@ti.com>
arch/arm/mach-omap2/devices.c | patch | blob | history |
index 8d43913f10d25bb9bd3b525c92740a70eb9440c6..e896e7b3885e9812e700af863dfb53757b734929 100644 (file)
static void omap_init_audio(void)
{
+ if (cpu_is_am33xx())
+ return;
+
platform_device_register(&omap_mcbsp1);
platform_device_register(&omap_mcbsp2);
- if ((cpu_is_omap243x() || cpu_is_omap34xx() || cpu_is_omap44xx()) &&
- !cpu_is_am33xx()) {
+ if (cpu_is_omap243x() || cpu_is_omap34xx() || cpu_is_omap44xx()) {
platform_device_register(&omap_mcbsp3);
platform_device_register(&omap_mcbsp4);
}
- if ((cpu_is_omap243x() || cpu_is_omap34xx()) && !cpu_is_am33xx())
+ if (cpu_is_omap243x() || cpu_is_omap34xx())
platform_device_register(&omap_mcbsp5);
platform_device_register(&omap_pcm);