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

Commit 851982c1 authored by Marek Vasut's avatar Marek Vasut Committed by Eric Miao
Browse files

ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 



This patch introduces pxa2xx_map_io() and pxa3xx_map_io() to distinguish
between PXA25x/PXA27x and PXA3xx memory mapping.

Also, fixup for platforms broken after introducing pxa{25x,27x}_map_io()
and pxa3xx_map_io() is included.

Signed-off-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 64ed267b

arch/arm/mach-pxa/balloon3.c

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




static void __init balloon3_map_io(void)

static void __init balloon3_map_io(void)

{

{

	pxa_map_io();

	pxa27x_map_io();

	iotable_init(balloon3_io_desc, ARRAY_SIZE(balloon3_io_desc));

	iotable_init(balloon3_io_desc, ARRAY_SIZE(balloon3_io_desc));

}

}

arch/arm/mach-pxa/capc7117.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -149,7 +149,7 @@ static void __init capc7117_init(void) 
MACHINE_START(CAPC7117,

MACHINE_START(CAPC7117,

	      "Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM")

	      "Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM")

	.boot_params = 0xa0000100,

	.boot_params = 0xa0000100,

	.map_io = pxa_map_io,

	.map_io = pxa3xx_map_io,

	.init_irq = pxa3xx_init_irq,

	.init_irq = pxa3xx_init_irq,

	.timer = &pxa_timer,

	.timer = &pxa_timer,

	.init_machine = capc7117_init

	.init_machine = capc7117_init

arch/arm/mach-pxa/cm-x2xx.c

+11 −2
Original line number Original line Diff line number Diff line
@@ -498,7 +498,12 @@ static struct map_desc cmx2xx_io_desc[] __initdata = { 




static void __init cmx2xx_map_io(void)

static void __init cmx2xx_map_io(void)

{

{

	pxa_map_io();

	if (cpu_is_pxa25x())

		pxa25x_map_io();



	if (cpu_is_pxa27x())

		pxa27x_map_io();



	iotable_init(cmx2xx_io_desc, ARRAY_SIZE(cmx2xx_io_desc));

	iotable_init(cmx2xx_io_desc, ARRAY_SIZE(cmx2xx_io_desc));





	it8152_base_address = CMX2XX_IT8152_VIRT;

	it8152_base_address = CMX2XX_IT8152_VIRT;
@@ -506,7 +511,11 @@ static void __init cmx2xx_map_io(void) 
#else

#else

static void __init cmx2xx_map_io(void)

static void __init cmx2xx_map_io(void)

{

{

	pxa_map_io();

	if (cpu_is_pxa25x())

		pxa25x_map_io();



	if (cpu_is_pxa27x())

		pxa27x_map_io();

}

}

#endif

#endif

arch/arm/mach-pxa/cm-x300.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -857,7 +857,7 @@ static void __init cm_x300_fixup(struct machine_desc *mdesc, struct tag *tags, 




MACHINE_START(CM_X300, "CM-X300 module")

MACHINE_START(CM_X300, "CM-X300 module")

	.boot_params	= 0xa0000100,

	.boot_params	= 0xa0000100,

	.map_io		= pxa_map_io,

	.map_io		= pxa3xx_map_io,

	.init_irq	= pxa3xx_init_irq,

	.init_irq	= pxa3xx_init_irq,

	.timer		= &pxa_timer,

	.timer		= &pxa_timer,

	.init_machine	= cm_x300_init,

	.init_machine	= cm_x300_init,

arch/arm/mach-pxa/colibri-pxa270.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -209,7 +209,7 @@ static void __init colibri_pxa270_income_init(void) 
MACHINE_START(COLIBRI, "Toradex Colibri PXA270")

MACHINE_START(COLIBRI, "Toradex Colibri PXA270")

	.boot_params	= COLIBRI_SDRAM_BASE + 0x100,

	.boot_params	= COLIBRI_SDRAM_BASE + 0x100,

	.init_machine	= colibri_pxa270_init,

	.init_machine	= colibri_pxa270_init,

	.map_io		= pxa_map_io,

	.map_io		= pxa27x_map_io,

	.init_irq	= pxa27x_init_irq,

	.init_irq	= pxa27x_init_irq,

	.timer		= &pxa_timer,

	.timer		= &pxa_timer,

MACHINE_END

MACHINE_END
@@ -217,7 +217,7 @@ MACHINE_END 
MACHINE_START(INCOME, "Income s.r.o. SH-Dmaster PXA270 SBC")

MACHINE_START(INCOME, "Income s.r.o. SH-Dmaster PXA270 SBC")

	.boot_params	= 0xa0000100,

	.boot_params	= 0xa0000100,

	.init_machine	= colibri_pxa270_income_init,

	.init_machine	= colibri_pxa270_income_init,

	.map_io		= pxa_map_io,

	.map_io		= pxa27x_map_io,

	.init_irq	= pxa27x_init_irq,

	.init_irq	= pxa27x_init_irq,

	.timer		= &pxa_timer,

	.timer		= &pxa_timer,

MACHINE_END

MACHINE_END