diff options
| author | Jaccon Bastiaansen <jaccon.bastiaansen@gmail.com> | 2012-04-30 11:53:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-22 11:34:12 -0700 |
| commit | eb60a7989c1a0f90f811c745f82a7c73f4e905c2 (patch) | |
| tree | cc1ace23822b3f39a68706c080d26f26d437e930 /arch/arm/mach-imx | |
| parent | 839cf7a236278ae358ff12141a168c0982fa0cd9 (diff) | |
| download | kernel_samsung_smdk4412-eb60a7989c1a0f90f811c745f82a7c73f4e905c2.zip kernel_samsung_smdk4412-eb60a7989c1a0f90f811c745f82a7c73f4e905c2.tar.gz kernel_samsung_smdk4412-eb60a7989c1a0f90f811c745f82a7c73f4e905c2.tar.bz2 | |
ARM i.MX imx21ads: Fix overlapping static i/o mappings
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>
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx21ads.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx21ads.c b/arch/arm/mach-imx/mach-mx21ads.c index 74ac889..a37fe02 100644 --- 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)) |