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

Commit 626863a3 authored by Ben Gardiner's avatar Ben Gardiner Committed by Sekhar Nori
Browse files

ARM: davinci: sram: switch from iotable to ioremapped regions 



The current davinci init sets up SRAM in iotables. There has been
an observed failure to boot a da850 with 128K specified in the
iotable.

Make the davinci sram allocator do an ioremap of the region
specified by the entries in davinci_soc_info before registering
with gen_pool_add_virt(). Remove all iotable SRAM mappings and
SRAM_VIRT.

Regression tested suspend/resume on AM180x EVM.

Signed-off-by: default avatarBen Gardiner <bengardiner@nanometrics.ca>
Signed-off-by: default avatarMatt Porter <mporter@ti.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 2eb2478d

arch/arm/mach-davinci/da850.c

+0 −6
Original line number Diff line number Diff line
@@ -781,12 +781,6 @@ static struct map_desc da850_io_desc[] = { 
		.length		= DA8XX_CP_INTC_SIZE,

		.type		= MT_DEVICE

	},

	{

		.virtual	= SRAM_VIRT,

		.pfn		= __phys_to_pfn(DA8XX_ARM_RAM_BASE),

		.length		= SZ_8K,

		.type		= MT_DEVICE

	},

};



static u32 da850_psc_bases[] = { DA8XX_PSC0_BASE, DA8XX_PSC1_BASE };

arch/arm/mach-davinci/dm355.c

+0 −6
Original line number Diff line number Diff line
@@ -758,12 +758,6 @@ static struct map_desc dm355_io_desc[] = { 
		.length		= IO_SIZE,

		.type		= MT_DEVICE

	},

	{

		.virtual	= SRAM_VIRT,

		.pfn		= __phys_to_pfn(0x00010000),

		.length		= SZ_32K,

		.type		= MT_MEMORY_NONCACHED,

	},

};



/* Contents of JTAG ID register used to identify exact cpu type */

arch/arm/mach-davinci/dm365.c

+0 −6
Original line number Diff line number Diff line
@@ -985,12 +985,6 @@ static struct map_desc dm365_io_desc[] = { 
		.length		= IO_SIZE,

		.type		= MT_DEVICE

	},

	{

		.virtual	= SRAM_VIRT,

		.pfn		= __phys_to_pfn(0x00010000),

		.length		= SZ_32K,

		.type		= MT_MEMORY_NONCACHED,

	},

};



static struct resource dm365_ks_resources[] = {

arch/arm/mach-davinci/dm644x.c

+0 −6
Original line number Diff line number Diff line
@@ -786,12 +786,6 @@ static struct map_desc dm644x_io_desc[] = { 
		.length		= IO_SIZE,

		.type		= MT_DEVICE

	},

	{

		.virtual	= SRAM_VIRT,

		.pfn		= __phys_to_pfn(0x00008000),

		.length		= SZ_16K,

		.type		= MT_MEMORY_NONCACHED,

	},

};



/* Contents of JTAG ID register used to identify exact cpu type */

arch/arm/mach-davinci/dm646x.c

+0 −6
Original line number Diff line number Diff line
@@ -756,12 +756,6 @@ static struct map_desc dm646x_io_desc[] = { 
		.length		= IO_SIZE,

		.type		= MT_DEVICE

	},

	{

		.virtual	= SRAM_VIRT,

		.pfn		= __phys_to_pfn(0x00010000),

		.length		= SZ_32K,

		.type		= MT_MEMORY_NONCACHED,

	},

};



/* Contents of JTAG ID register used to identify exact cpu type */