Commit 134d12fa authored by Ohad Ben-Cohen's avatar Ohad Ben-Cohen Committed by Joerg Roedel

ARM: OMAP: fix iommu, not mailbox

For some weird (freudian?) reason, commit 435792d9 "ARM: OMAP: make
iommu subsys_initcall to fix builtin omap3isp" unintentionally changed
the mailbox's initcall instead of the iommu's.

Fix that.
Reported-by: default avatarFernando Guzman Lugo <fernando.lugo@ti.com>
Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Joerg Roedel <Joerg.Roedel@amd.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent 435792d9
...@@ -412,8 +412,7 @@ static void __exit omap2_mbox_exit(void) ...@@ -412,8 +412,7 @@ static void __exit omap2_mbox_exit(void)
platform_driver_unregister(&omap2_mbox_driver); platform_driver_unregister(&omap2_mbox_driver);
} }
/* must be ready before omap3isp is probed */ module_init(omap2_mbox_init);
subsys_initcall(omap2_mbox_init);
module_exit(omap2_mbox_exit); module_exit(omap2_mbox_exit);
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
......
...@@ -150,7 +150,8 @@ static int __init omap_iommu_init(void) ...@@ -150,7 +150,8 @@ static int __init omap_iommu_init(void)
platform_device_put(omap_iommu_pdev[i]); platform_device_put(omap_iommu_pdev[i]);
return err; return err;
} }
module_init(omap_iommu_init); /* must be ready before omap3isp is probed */
subsys_initcall(omap_iommu_init);
static void __exit omap_iommu_exit(void) static void __exit omap_iommu_exit(void)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment