diff options
author | Ohad Ben-Cohen <ohad@wizery.com> | 2012-02-26 05:14:14 -0500 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2012-02-27 08:18:42 -0500 |
commit | 435792d93410f008120c4dbab148019a3cc31dbc (patch) | |
tree | 75a00f883430d67798373847b6e2033cb18d9f9c /arch/arm/mach-omap2/mailbox.c | |
parent | 87997aaa1bad1fc37e4ff7eb27850172017017a0 (diff) |
ARM: OMAP: make iommu subsys_initcall to fix builtin omap3isp
omap3isp depends on omap's iommu and will fail to probe if
initialized before it (which always happen if they are builtin).
Make omap's iommu subsys_initcall as an interim solution until
the probe deferral mechanism is merged.
Reported-by: James <angweiyang@gmail.com>
Debugged-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Cc: stable <stable@vger.kernel.org>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Hiroshi Doyu <hdoyu@nvidia.com>
Cc: Joerg Roedel <Joerg.Roedel@amd.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'arch/arm/mach-omap2/mailbox.c')
-rw-r--r-- | arch/arm/mach-omap2/mailbox.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c index 609ea2ded7e3..a6db1e4f7b6e 100644 --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c | |||
@@ -412,7 +412,8 @@ static void __exit omap2_mbox_exit(void) | |||
412 | platform_driver_unregister(&omap2_mbox_driver); | 412 | platform_driver_unregister(&omap2_mbox_driver); |
413 | } | 413 | } |
414 | 414 | ||
415 | module_init(omap2_mbox_init); | 415 | /* must be ready before omap3isp is probed */ |
416 | subsys_initcall(omap2_mbox_init); | ||
416 | module_exit(omap2_mbox_exit); | 417 | module_exit(omap2_mbox_exit); |
417 | 418 | ||
418 | MODULE_LICENSE("GPL v2"); | 419 | MODULE_LICENSE("GPL v2"); |