]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.0-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 18 Jun 2012 15:39:54 +0000 (08:39 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 18 Jun 2012 15:39:54 +0000 (08:39 -0700)
added patches:
arm-i.mx-imx21ads-fix-overlapping-static-i-o-mappings.patch

queue-3.0/arm-i.mx-imx21ads-fix-overlapping-static-i-o-mappings.patch [new file with mode: 0644]
queue-3.0/series [new file with mode: 0644]

diff --git a/queue-3.0/arm-i.mx-imx21ads-fix-overlapping-static-i-o-mappings.patch b/queue-3.0/arm-i.mx-imx21ads-fix-overlapping-static-i-o-mappings.patch
new file mode 100644 (file)
index 0000000..0edc230
--- /dev/null
@@ -0,0 +1,34 @@
+From 350ab15bb2ffe7103bc6bf6c634f3c5b286eaf2a Mon Sep 17 00:00:00 2001
+From: Jaccon Bastiaansen <jaccon.bastiaansen@gmail.com>
+Date: Mon, 30 Apr 2012 11:53:43 +0200
+Subject: ARM i.MX imx21ads: Fix overlapping static i/o mappings
+
+From: Jaccon Bastiaansen <jaccon.bastiaansen@gmail.com>
+
+commit 350ab15bb2ffe7103bc6bf6c634f3c5b286eaf2a upstream.
+
+The statically defined I/O memory regions for the i.MX21 on chip
+peripherals and the on board I/O peripherals of the i.MX21ADS board
+overlap. This results in a kernel crash during startup. This is fixed
+by reducing the memory range for the on board I/O peripherals to the
+actually required range.
+
+Signed-off-by: Jaccon Bastiaansen <jaccon.bastiaansen@gmail.com>
+Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/mach-imx/mach-mx21ads.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/mach-imx/mach-mx21ads.c
++++ b/arch/arm/mach-imx/mach-mx21ads.c
+@@ -32,7 +32,7 @@
+  * Memory-mapped I/O on MX21ADS base board
+  */
+ #define MX21ADS_MMIO_BASE_ADDR   0xf5000000
+-#define MX21ADS_MMIO_SIZE        SZ_16M
++#define MX21ADS_MMIO_SIZE        0xc00000
+ #define MX21ADS_REG_ADDR(offset)    (void __force __iomem *) \
+               (MX21ADS_MMIO_BASE_ADDR + (offset))
diff --git a/queue-3.0/series b/queue-3.0/series
new file mode 100644 (file)
index 0000000..3f959e1
--- /dev/null
@@ -0,0 +1 @@
+arm-i.mx-imx21ads-fix-overlapping-static-i-o-mappings.patch