3.2-stable patches

added patches:
	arm-omap-fix-iommu-not-mailbox.patch

diff --git a/queue-3.2/arm-omap-fix-iommu-not-mailbox.patch b/queue-3.2/arm-omap-fix-iommu-not-mailbox.patch
new file mode 100644 (file)
index 0000000..1c5f949
--- /dev/null
+++ b/queue-3.2/arm-omap-fix-iommu-not-mailbox.patch
@@ -0,0 +1,52 @@
+From 134d12fae0bb8f3d60dc7440a9e1950bb5427167 Mon Sep 17 00:00:00 2001
+From: Ohad Ben-Cohen <ohad@wizery.com>
+Date: Sun, 4 Mar 2012 12:01:11 +0200
+Subject: ARM: OMAP: fix iommu, not mailbox
+
+From: Ohad Ben-Cohen <ohad@wizery.com>
+
+commit 134d12fae0bb8f3d60dc7440a9e1950bb5427167 upstream.
+
+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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/mach-omap2/mailbox.c    |    3 +--
+ arch/arm/mach-omap2/omap-iommu.c |    3 ++-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/arch/arm/mach-omap2/mailbox.c
++++ b/arch/arm/mach-omap2/mailbox.c
+@@ -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");
+--- 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)
+ {

diff --git a/queue-3.2/series b/queue-3.2/series
index 1709a182a4d2d98ec5d75f34c74da2e1db6bd552..3e7b2e21759df819deadedde73bd6213e8ca832f 100644 (file)
--- a/queue-3.2/series
+++ b/queue-3.2/series
@@ -93,3 +93,4 @@ dm-raid-fix-flush-support.patch
 cs5535-mfgpt-don-t-call-__init-function-from-__devinit.patch
 mfd-fix-cs5535-section-mismatch.patch
 spi-topcliff-pch-rename-pch_spi_pcidev-to-pch_spi_pcidev_driver.patch
+arm-omap-fix-iommu-not-mailbox.patch