Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/mach-omap2/mailbox.c

+1 −2
Original line number Diff line number Diff line
@@ -412,8 +412,7 @@ static void __exit omap2_mbox_exit(void) 
	platform_driver_unregister(&omap2_mbox_driver);

}



/* must be ready before omap3isp is probed */

subsys_initcall(omap2_mbox_init);

module_init(omap2_mbox_init);

module_exit(omap2_mbox_exit);



MODULE_LICENSE("GPL v2");

arch/arm/mach-omap2/omap-iommu.c

+2 −1
Original line number Diff line number Diff line
@@ -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)

{