diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-29 10:37:36 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-24 11:30:13 +0000 |
| commit | 876c1f27852ff1e45e1164da15847d3b25600160 (patch) | |
| tree | 628ab226ed9cacf8192019fd85a6529842626d80 /arch/arm/mach-sa1100 | |
| parent | 22eeaff367ac85a09643b2b8a5af064ec8773f63 (diff) | |
| download | linux-stable-876c1f27852ff1e45e1164da15847d3b25600160.tar.gz linux-stable-876c1f27852ff1e45e1164da15847d3b25600160.tar.bz2 linux-stable-876c1f27852ff1e45e1164da15847d3b25600160.zip | |
ARM: sa11x0: don't static map sa1111
The sa1111 support will ioremap() the device; there is no need for
platforms to setup a static mapping for this. Remove the static
mapping for this device from badge4, jornada720 and neponset.
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100')
| -rw-r--r-- | arch/arm/mach-sa1100/badge4.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/jornada720.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/neponset.c | 5 |
3 files changed, 0 insertions, 15 deletions
diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c index 8fb80f02c2a9..645ffa1ddc7c 100644 --- a/arch/arm/mach-sa1100/badge4.c +++ b/arch/arm/mach-sa1100/badge4.c @@ -285,11 +285,6 @@ static struct map_desc badge4_io_desc[] __initdata = { .pfn = __phys_to_pfn(0x10000000), .length = 0x00100000, .type = MT_DEVICE - }, { /* SA-1111 */ - .virtual = 0xf4000000, - .pfn = __phys_to_pfn(0x48000000), - .length = 0x00100000, - .type = MT_DEVICE } }; diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c index dcd6d026aa68..5d2ceb40dac9 100644 --- a/arch/arm/mach-sa1100/jornada720.c +++ b/arch/arm/mach-sa1100/jornada720.c @@ -285,11 +285,6 @@ static struct map_desc jornada720_io_desc[] __initdata = { .pfn = __phys_to_pfn(EPSONFBSTART), .length = EPSONFBLEN, .type = MT_DEVICE - }, { /* SA-1111 */ - .virtual = 0xf4000000, - .pfn = __phys_to_pfn(SA1111REGSTART), - .length = SA1111REGLEN, - .type = MT_DEVICE } }; diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c index b40a7192f09f..290afedde749 100644 --- a/arch/arm/mach-sa1100/neponset.c +++ b/arch/arm/mach-sa1100/neponset.c @@ -333,11 +333,6 @@ static struct map_desc neponset_io_desc[] __initdata = { .pfn = __phys_to_pfn(0x10000000), .length = SZ_1M, .type = MT_DEVICE - }, { /* SA-1111 */ - .virtual = 0xf4000000, - .pfn = __phys_to_pfn(0x40000000), - .length = SZ_1M, - .type = MT_DEVICE } }; |