[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20120309190202.425318888@linuxfoundation.org>
Date: Fri, 09 Mar 2012 11:02:03 -0800
From: Greg KH <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org, stable@...r.kernel.org
Cc: torvalds@...ux-foundation.org, akpm@...ux-foundation.org,
alan@...rguk.ukuu.org.uk, James <angweiyang@...il.com>,
Ohad Ben-Cohen <ohad@...ery.com>,
Tony Lindgren <tony@...mide.com>,
Hiroshi Doyu <hdoyu@...dia.com>,
Joerg Roedel <Joerg.Roedel@....com>,
Joerg Roedel <joerg.roedel@....com>
Subject: [ 01/95] ARM: OMAP: make iommu subsys_initcall to fix builtin omap3isp
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ohad Ben-Cohen <ohad@...ery.com>
commit 435792d93410f008120c4dbab148019a3cc31dbc upstream.
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@...il.com>
Debugged-by: Laurent Pinchart <laurent.pinchart@...asonboard.com>
Signed-off-by: Ohad Ben-Cohen <ohad@...ery.com>
Cc: Tony Lindgren <tony@...mide.com>
Cc: Hiroshi Doyu <hdoyu@...dia.com>
Cc: Joerg Roedel <Joerg.Roedel@....com>
Signed-off-by: Joerg Roedel <joerg.roedel@....com>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
arch/arm/mach-omap2/mailbox.c | 3 ++-
drivers/iommu/omap-iommu.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
--- 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)
platform_driver_unregister(&omap2_mbox_driver);
}
-module_init(omap2_mbox_init);
+/* must be ready before omap3isp is probed */
+subsys_initcall(omap2_mbox_init);
module_exit(omap2_mbox_exit);
MODULE_LICENSE("GPL v2");
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -1229,7 +1229,8 @@ static int __init omap_iommu_init(void)
return platform_driver_register(&omap_iommu_driver);
}
-module_init(omap_iommu_init);
+/* must be ready before omap3isp is probed */
+subsys_initcall(omap_iommu_init);
static void __exit omap_iommu_exit(void)
{
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists