This is a note to let you know that I've just added the patch titled
ARM: OMAP: make iommu subsys_initcall to fix builtin omap3isp
to the 3.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm-omap-make-iommu-subsys_initcall-to-fix-builtin-omap3isp.patch
and it can be found in the queue-3.2 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 435792d93410f008120c4dbab148019a3cc31dbc Mon Sep 17 00:00:00 2001
From: Ohad Ben-Cohen <[email protected]>
Date: Sun, 26 Feb 2012 12:14:14 +0200
Subject: ARM: OMAP: make iommu subsys_initcall to fix builtin omap3isp
From: Ohad Ben-Cohen <[email protected]>
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 <[email protected]>
Debugged-by: Laurent Pinchart <[email protected]>
Signed-off-by: Ohad Ben-Cohen <[email protected]>
Cc: Tony Lindgren <[email protected]>
Cc: Hiroshi Doyu <[email protected]>
Cc: Joerg Roedel <[email protected]>
Signed-off-by: Joerg Roedel <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
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)
{
Patches currently in stable-queue which might be from [email protected] are
queue-3.2/arm-omap-make-iommu-subsys_initcall-to-fix-builtin-omap3isp.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
