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

Commit fb4416ad authored by Sascha Hauer's avatar Sascha Hauer
Browse files

[ARM] MX31: Move static virtual mappings of AIPS1/2 to common file 



On MX31 we can't do much without mapping the AIPS1/2 register space.
Move these mappings from individual boards to plat-mxc/mm.c

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent cb88214d

arch/arm/mach-mx3/mm.c

+10 −0
Original line number Diff line number Diff line
@@ -54,6 +54,16 @@ static struct map_desc mxc_io_desc[] __initdata = { 
		.pfn		= __phys_to_pfn(AVIC_BASE_ADDR),

		.length		= AVIC_SIZE,

		.type		= MT_DEVICE_NONSHARED

	}, {

		.virtual	= AIPS1_BASE_ADDR_VIRT,

		.pfn		= __phys_to_pfn(AIPS1_BASE_ADDR),

		.length		= AIPS1_SIZE,

		.type		= MT_DEVICE_NONSHARED

	}, {

		.virtual	= AIPS2_BASE_ADDR_VIRT,

		.pfn		= __phys_to_pfn(AIPS2_BASE_ADDR),

		.length		= AIPS2_SIZE,

		.type		= MT_DEVICE_NONSHARED

	},

};

arch/arm/mach-mx3/mx31ads.c

+0 −10
Original line number Diff line number Diff line
@@ -492,20 +492,10 @@ static void mxc_init_i2c(void) 
 */

static struct map_desc mx31ads_io_desc[] __initdata = {

	{

		.virtual	= AIPS1_BASE_ADDR_VIRT,

		.pfn		= __phys_to_pfn(AIPS1_BASE_ADDR),

		.length		= AIPS1_SIZE,

		.type		= MT_DEVICE_NONSHARED

	}, {

		.virtual	= SPBA0_BASE_ADDR_VIRT,

		.pfn		= __phys_to_pfn(SPBA0_BASE_ADDR),

		.length		= SPBA0_SIZE,

		.type		= MT_DEVICE_NONSHARED

	}, {

		.virtual	= AIPS2_BASE_ADDR_VIRT,

		.pfn		= __phys_to_pfn(AIPS2_BASE_ADDR),

		.length		= AIPS2_SIZE,

		.type		= MT_DEVICE_NONSHARED

	}, {

		.virtual	= CS4_BASE_ADDR_VIRT,

		.pfn		= __phys_to_pfn(CS4_BASE_ADDR),

arch/arm/mach-mx3/mx31lite.c

+0 −10
Original line number Diff line number Diff line
@@ -42,20 +42,10 @@ 
 */

static struct map_desc mx31lite_io_desc[] __initdata = {

	{

		.virtual = AIPS1_BASE_ADDR_VIRT,

		.pfn = __phys_to_pfn(AIPS1_BASE_ADDR),

		.length = AIPS1_SIZE,

		.type = MT_DEVICE_NONSHARED

	}, {

		.virtual = SPBA0_BASE_ADDR_VIRT,

		.pfn = __phys_to_pfn(SPBA0_BASE_ADDR),

		.length = SPBA0_SIZE,

		.type = MT_DEVICE_NONSHARED

	}, {

		.virtual = AIPS2_BASE_ADDR_VIRT,

		.pfn = __phys_to_pfn(AIPS2_BASE_ADDR),

		.length = AIPS2_SIZE,

		.type = MT_DEVICE_NONSHARED

	}, {

		.virtual = CS4_BASE_ADDR_VIRT,

		.pfn = __phys_to_pfn(CS4_BASE_ADDR),

arch/arm/mach-mx3/mx31moboard.c

+1 −27
Original line number Diff line number Diff line
@@ -103,32 +103,6 @@ static void __init mxc_board_init(void) 
	}

}



/*

 * This structure defines static mappings for the mx31moboard.

 */

static struct map_desc mx31moboard_io_desc[] __initdata = {

	{

		.virtual	= AIPS1_BASE_ADDR_VIRT,

		.pfn		= __phys_to_pfn(AIPS1_BASE_ADDR),

		.length		= AIPS1_SIZE,

		.type		= MT_DEVICE_NONSHARED

	}, {

		.virtual	= AIPS2_BASE_ADDR_VIRT,

		.pfn		= __phys_to_pfn(AIPS2_BASE_ADDR),

		.length		= AIPS2_SIZE,

		.type		= MT_DEVICE_NONSHARED

	},

};



/*

 * Set up static virtual mappings.

 */

void __init mx31moboard_map_io(void)

{

	mxc_map_io();

	iotable_init(mx31moboard_io_desc, ARRAY_SIZE(mx31moboard_io_desc));

}



static void __init mx31moboard_timer_init(void)

{

	mx31_clocks_init(26000000);
@@ -143,7 +117,7 @@ MACHINE_START(MX31MOBOARD, "EPFL Mobots mx31moboard") 
	.phys_io	= AIPS1_BASE_ADDR,

	.io_pg_offst	= ((AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,

	.boot_params    = PHYS_OFFSET + 0x100,

	.map_io         = mx31moboard_map_io,

	.map_io         = mxc_map_io,

	.init_irq       = mxc_init_irq,

	.init_machine   = mxc_board_init,

	.timer          = &mx31moboard_timer,

arch/arm/mach-mx3/mx31pdk.c

+1 −27
Original line number Diff line number Diff line
@@ -58,32 +58,6 @@ static inline void mxc_init_imx_uart(void) 
	mxc_register_device(&mxc_uart_device0, &uart_pdata);

}



/*!

 * This structure defines static mappings for the i.MX31PDK board.

 */

static struct map_desc mx31pdk_io_desc[] __initdata = {

	{

		.virtual	= AIPS1_BASE_ADDR_VIRT,

		.pfn		= __phys_to_pfn(AIPS1_BASE_ADDR),

		.length		= AIPS1_SIZE,

		.type		= MT_DEVICE_NONSHARED

	}, {

		.virtual	= AIPS2_BASE_ADDR_VIRT,

		.pfn		= __phys_to_pfn(AIPS2_BASE_ADDR),

		.length		= AIPS2_SIZE,

		.type		= MT_DEVICE_NONSHARED

	},

};



/*!

 * Set up static virtual mappings.

 */

static void __init mx31pdk_map_io(void)

{

	mxc_map_io();

	iotable_init(mx31pdk_io_desc, ARRAY_SIZE(mx31pdk_io_desc));

}



/*!

 * Board specific initialization.

 */
@@ -110,7 +84,7 @@ MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)") 
	.phys_io	= AIPS1_BASE_ADDR,

	.io_pg_offst	= ((AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,

	.boot_params    = PHYS_OFFSET + 0x100,

	.map_io         = mx31pdk_map_io,

	.map_io         = mxc_map_io,

	.init_irq       = mxc_init_irq,

	.init_machine   = mxc_board_init,

	.timer          = &mx31pdk_timer,