From 6f0fdfac0bbed9e2a0d4856785fa570893905378 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 18 Jun 2012 08:39:54 -0700 Subject: [PATCH] 3.0-stable patches added patches: arm-i.mx-imx21ads-fix-overlapping-static-i-o-mappings.patch --- ...-fix-overlapping-static-i-o-mappings.patch | 34 +++++++++++++++++++ queue-3.0/series | 1 + 2 files changed, 35 insertions(+) create mode 100644 queue-3.0/arm-i.mx-imx21ads-fix-overlapping-static-i-o-mappings.patch create mode 100644 queue-3.0/series 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 index 00000000000..0edc2303208 --- /dev/null +++ b/queue-3.0/arm-i.mx-imx21ads-fix-overlapping-static-i-o-mappings.patch @@ -0,0 +1,34 @@ +From 350ab15bb2ffe7103bc6bf6c634f3c5b286eaf2a Mon Sep 17 00:00:00 2001 +From: Jaccon Bastiaansen +Date: Mon, 30 Apr 2012 11:53:43 +0200 +Subject: ARM i.MX imx21ads: Fix overlapping static i/o mappings + +From: Jaccon Bastiaansen + +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 +Signed-off-by: Sascha Hauer +Signed-off-by: Greg Kroah-Hartman + +--- + 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 index 00000000000..3f959e1bebe --- /dev/null +++ b/queue-3.0/series @@ -0,0 +1 @@ +arm-i.mx-imx21ads-fix-overlapping-static-i-o-mappings.patch -- 2.47.3