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

Commit e94c4c34 authored by Wolfgang Denk's avatar Wolfgang Denk Committed by Sascha Hauer
Browse files

ARM: MX3: make CPU revision number detection work on all boards 



Commit 52939c03 (ARM: MX3: fix CPU revision number detection) started
using the CPU's SREV register for revision number detection. This
makes it mandatory to have a valid SPBA0 mapping. Add this to the
global map_io code instead of adding multiple copies for each board.

Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
Cc: Daniel Mack <daniel@caiaq.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>

Tested on Qong (EVB-Lite)
Tested-by: default avatarWolfgang Denk <wd@denx.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent e71fbaf7

arch/arm/mach-mx3/mm.c

+5 −0
Original line number Diff line number Diff line
@@ -65,6 +65,11 @@ static struct map_desc mxc_io_desc[] __initdata = { 
		.pfn		= __phys_to_pfn(AIPS2_BASE_ADDR),

		.length		= AIPS2_SIZE,

		.type		= MT_DEVICE_NONSHARED

	}, {

		.virtual = SPBA0_BASE_ADDR_VIRT,

		.pfn = __phys_to_pfn(SPBA0_BASE_ADDR),

		.length = SPBA0_SIZE,

		.type = MT_DEVICE_NONSHARED

	},

};

arch/arm/mach-mx3/mx31ads.c

+0 −5
Original line number Diff line number Diff line
@@ -494,11 +494,6 @@ static void mxc_init_i2c(void) 
 */

static struct map_desc mx31ads_io_desc[] __initdata = {

	{

		.virtual	= SPBA0_BASE_ADDR_VIRT,

		.pfn		= __phys_to_pfn(SPBA0_BASE_ADDR),

		.length		= SPBA0_SIZE,

		.type		= MT_DEVICE_NONSHARED

	}, {

		.virtual	= CS4_BASE_ADDR_VIRT,

		.pfn		= __phys_to_pfn(CS4_BASE_ADDR),

		.length		= CS4_SIZE / 2,

arch/arm/mach-mx3/mx31lite.c

+0 −5
Original line number Diff line number Diff line
@@ -212,11 +212,6 @@ static struct platform_device physmap_flash_device = { 
 */

static struct map_desc mx31lite_io_desc[] __initdata = {

	{

		.virtual = SPBA0_BASE_ADDR_VIRT,

		.pfn = __phys_to_pfn(SPBA0_BASE_ADDR),

		.length = SPBA0_SIZE,

		.type = MT_DEVICE_NONSHARED

	}, {

		.virtual = CS4_BASE_ADDR_VIRT,

		.pfn = __phys_to_pfn(CS4_BASE_ADDR),

		.length = CS4_SIZE,

arch/arm/mach-mx3/mx31pdk.c

+0 −5
Original line number Diff line number Diff line
@@ -211,11 +211,6 @@ static int __init mx31pdk_init_expio(void) 
 */

static struct map_desc mx31pdk_io_desc[] __initdata = {

	{

		.virtual = SPBA0_BASE_ADDR_VIRT,

		.pfn = __phys_to_pfn(SPBA0_BASE_ADDR),

		.length = SPBA0_SIZE,

		.type = MT_DEVICE_NONSHARED,

	}, {

		.virtual = CS5_BASE_ADDR_VIRT,

		.pfn = __phys_to_pfn(CS5_BASE_ADDR),

		.length = CS5_SIZE,