Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 134d12fae0bb8f3d60dc7440a9e1950bb5427167

Authored by Ohad Ben-Cohen
Committed by Joerg Roedel
1 parent 435792d934
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff

arch/arm/mach-omap2/mailbox.c
Diff comments   View file @ 134d12f
... ... @@ -412,8 +412,7 @@
412 412 platform_driver_unregister(&omap2_mbox_driver);
413 413 }
414 414  
415   -/* must be ready before omap3isp is probed */
416   -subsys_initcall(omap2_mbox_init);
  415 +module_init(omap2_mbox_init);
417 416 module_exit(omap2_mbox_exit);
418 417  
419 418 MODULE_LICENSE("GPL v2");
arch/arm/mach-omap2/omap-iommu.c
Diff comments   View file @ 134d12f
... ... @@ -150,7 +150,8 @@
150 150 platform_device_put(omap_iommu_pdev[i]);
151 151 return err;
152 152 }
153   -module_init(omap_iommu_init);
  153 +/* must be ready before omap3isp is probed */
  154 +subsys_initcall(omap_iommu_init);
154 155  
155 156 static void __exit omap_iommu_exit(void)
156 157 {