Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 876c1f27 authored Jan 29, 2012 by Russell King

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>

parent 22eeaff3

arch/arm/mach-sa1100/badge4.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -285,11 +285,6 @@ static struct map_desc badge4_io_desc[] __initdata = {
	.pfn = __phys_to_pfn(0x10000000),		.pfn = __phys_to_pfn(0x10000000),
	.length = 0x00100000,		.length = 0x00100000,
	.type = MT_DEVICE		.type = MT_DEVICE
	}, { /* SA-1111 */
	.virtual = 0xf4000000,
	.pfn = __phys_to_pfn(0x48000000),
	.length = 0x00100000,
	.type = MT_DEVICE
	}		}
	};		};

arch/arm/mach-sa1100/jornada720.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -285,11 +285,6 @@ static struct map_desc jornada720_io_desc[] __initdata = {
	.pfn = __phys_to_pfn(EPSONFBSTART),		.pfn = __phys_to_pfn(EPSONFBSTART),
	.length = EPSONFBLEN,		.length = EPSONFBLEN,
	.type = MT_DEVICE		.type = MT_DEVICE
	}, { /* SA-1111 */
	.virtual = 0xf4000000,
	.pfn = __phys_to_pfn(SA1111REGSTART),
	.length = SA1111REGLEN,
	.type = MT_DEVICE
	}		}
	};		};

arch/arm/mach-sa1100/neponset.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -333,11 +333,6 @@ static struct map_desc neponset_io_desc[] __initdata = {
	.pfn = __phys_to_pfn(0x10000000),		.pfn = __phys_to_pfn(0x10000000),
	.length = SZ_1M,		.length = SZ_1M,
	.type = MT_DEVICE		.type = MT_DEVICE
	}, { /* SA-1111 */
	.virtual = 0xf4000000,
	.pfn = __phys_to_pfn(0x40000000),
	.length = SZ_1M,
	.type = MT_DEVICE
	}		}
	};		};