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

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

MXC: rename mxc_map_io to architecture specific versions 



This allows us to have more mapping functions for more than one
i.MX architecture in the kernel. As this is the earliest board
specific hook we have, also use it to set the cpu type.

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

arch/arm/mach-mx1/generic.c

+3 −1
Original line number Diff line number Diff line
@@ -37,7 +37,9 @@ static struct map_desc imx_io_desc[] __initdata = { 
	}

};



void __init mxc_map_io(void)

void __init mx1_map_io(void)

{

	mxc_set_cpu_type(MXC_CPU_MX1);



	iotable_init(imx_io_desc, ARRAY_SIZE(imx_io_desc));

}

arch/arm/mach-mx1/mx1ads.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ MACHINE_START(MXLADS, "Freescale MXLADS") 
	.phys_io	= IMX_IO_PHYS,

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

	.boot_params	= PHYS_OFFSET + 0x100,

	.map_io		= mxc_map_io,

	.map_io		= mx1_map_io,

	.init_irq	= mxc_init_irq,

	.timer		= &mx1ads_timer,

	.init_machine	= mx1ads_init,

arch/arm/mach-mx1/scb9328.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ MACHINE_START(SCB9328, "Synertronixx scb9328") 
	.phys_io	= 0x00200000,

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

	.boot_params	= 0x08000100,

	.map_io		= mxc_map_io,

	.map_io		= mx1_map_io,

	.init_irq	= mxc_init_irq,

	.timer		= &scb9328_timer,

	.init_machine	= scb9328_init,

arch/arm/mach-mx2/generic.c

+11 −1
Original line number Diff line number Diff line
@@ -69,7 +69,17 @@ static struct map_desc mxc_io_desc[] __initdata = { 
 * system startup to create static physical to virtual

 * memory map for the IO modules.

 */

void __init mxc_map_io(void)

void __init mx21_map_io(void)

{

	mxc_set_cpu_type(MXC_CPU_MX21);



	iotable_init(mxc_io_desc, ARRAY_SIZE(mxc_io_desc));

}



void __init mx27_map_io(void)

{

	mxc_set_cpu_type(MXC_CPU_MX27);



	iotable_init(mxc_io_desc, ARRAY_SIZE(mxc_io_desc));

}

arch/arm/mach-mx2/mx27ads.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static struct map_desc mx27ads_io_desc[] __initdata = { 


static void __init mx27ads_map_io(void)

{

	mxc_map_io();

	mx27_map_io();

	iotable_init(mx27ads_io_desc, ARRAY_SIZE(mx27ads_io_desc));

}