diff options
author | Ohad Ben-Cohen <ohad@wizery.com> | 2012-03-04 10:01:11 (GMT) |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2012-03-05 14:18:20 (GMT) |
commit | 134d12fae0bb8f3d60dc7440a9e1950bb5427167 (patch) | |
tree | db3c73622cc813f6b70d9a6068198962ddfb3257 /arch/arm/mach-omap2/omap-iommu.c | |
parent | 435792d93410f008120c4dbab148019a3cc31dbc (diff) | |
download | linux-134d12fae0bb8f3d60dc7440a9e1950bb5427167.tar.xz |
ARM: OMAP: fix iommu, not mailbox
For some weird (freudian?) reason, commit 435792d "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: Fernando Guzman Lugo <fernando.lugo@ti.com>
Signed-off-by: Ohad 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: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'arch/arm/mach-omap2/omap-iommu.c')
-rw-r--r-- | arch/arm/mach-omap2/omap-iommu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c index b882204..ac49384 100644 --- a/arch/arm/mach-omap2/omap-iommu.c +++ b/arch/arm/mach-omap2/omap-iommu.c @@ -150,7 +150,8 @@ err_out: platform_device_put(omap_iommu_pdev[i]); 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) { |