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

Commit e71504d5 authored Sep 11, 2011 by Laurent Pinchart

arm: mach-shmobile: Split MERAM resources into regs and meram



The MERAM resource currently combines both the registers space and the
MERAM space. Only the register space needs to be ioremapped, split the
resource to make that possible.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

parent 4976677f

arch/arm/mach-shmobile/board-ap4evb.c

+10 −4

Original line number	Original line	Diff line number	Diff line
	@@ -258,8 +258,14 @@ static struct sh_mobile_meram_info meram_info = {

	static struct resource meram_resources[] = {		static struct resource meram_resources[] = {
	[0] = {		[0] = {
	.name = "MERAM",		.name = "regs",
	.start = 0xe8000000,		.start = 0xe8000000,
			.end = 0xe807ffff,
			.flags = IORESOURCE_MEM,
			},
			[1] = {
			.name = "meram",
			.start = 0xe8080000,
	.end = 0xe81fffff,		.end = 0xe81fffff,
	.flags = IORESOURCE_MEM,		.flags = IORESOURCE_MEM,
	},		},

arch/arm/mach-shmobile/board-mackerel.c

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -318,8 +318,14 @@ static struct sh_mobile_meram_info mackerel_meram_info = {

	static struct resource meram_resources[] = {		static struct resource meram_resources[] = {
	[0] = {		[0] = {
	.name = "MERAM",		.name = "regs",
	.start = 0xe8000000,		.start = 0xe8000000,
			.end = 0xe807ffff,
			.flags = IORESOURCE_MEM,
			},
			[1] = {
			.name = "meram",
			.start = 0xe8080000,
	.end = 0xe81fffff,		.end = 0xe81fffff,
	.flags = IORESOURCE_MEM,		.flags = IORESOURCE_MEM,
	},		},