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

Commit 14efc54a authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Nicolas Ferre
Browse files

ARM: at91: remove useless map_io 



Now that the SRAM is initialized by the mmio-sram driver, .map_io is useless.
remove it.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 4db0ba22

arch/arm/mach-at91/at91rm9200.c

+0 −6
Original line number Diff line number Diff line
@@ -42,11 +42,6 @@ static void at91rm9200_restart(enum reboot_mode reboot_mode, const char *cmd) 
/* --------------------------------------------------------------------

 *  AT91RM9200 processor initialization

 * -------------------------------------------------------------------- */

static void __init at91rm9200_map_io(void)

{

	/* Map peripherals */

	at91_init_sram(0, AT91RM9200_SRAM_BASE, AT91RM9200_SRAM_SIZE);

}



static void __init at91rm9200_initialize(void)

{
@@ -56,6 +51,5 @@ static void __init at91rm9200_initialize(void) 




AT91_SOC_START(at91rm9200)

	.map_io = at91rm9200_map_io,

	.init = at91rm9200_initialize,

AT91_SOC_END

arch/arm/mach-at91/at91sam9260.c

+0 −27
Original line number Diff line number Diff line
@@ -22,38 +22,11 @@ 
 *  AT91SAM9260 processor initialization

 * -------------------------------------------------------------------- */



static void __init at91sam9xe_map_io(void)

{

	unsigned long sram_size;



	switch (at91_soc_initdata.cidr & AT91_CIDR_SRAMSIZ) {

		case AT91_CIDR_SRAMSIZ_32K:

			sram_size = 2 * SZ_16K;

			break;

		case AT91_CIDR_SRAMSIZ_16K:

		default:

			sram_size = SZ_16K;

	}



	at91_init_sram(0, AT91SAM9XE_SRAM_BASE, sram_size);

}



static void __init at91sam9260_map_io(void)

{

	if (cpu_is_at91sam9xe())

		at91sam9xe_map_io();

	else if (cpu_is_at91sam9g20())

		at91_init_sram(0, AT91SAM9G20_SRAM_BASE, AT91SAM9G20_SRAM_SIZE);

	else

		at91_init_sram(0, AT91SAM9260_SRAM_BASE, AT91SAM9260_SRAM_SIZE);

}



static void __init at91sam9260_initialize(void)

{

	arm_pm_idle = at91sam9_idle;

}



AT91_SOC_START(at91sam9260)

	.map_io = at91sam9260_map_io,

	.init = at91sam9260_initialize,

AT91_SOC_END

arch/arm/mach-at91/at91sam9261.c

+0 −9
Original line number Diff line number Diff line
@@ -21,20 +21,11 @@ 
 *  AT91SAM9261 processor initialization

 * -------------------------------------------------------------------- */



static void __init at91sam9261_map_io(void)

{

	if (cpu_is_at91sam9g10())

		at91_init_sram(0, AT91SAM9G10_SRAM_BASE, AT91SAM9G10_SRAM_SIZE);

	else

		at91_init_sram(0, AT91SAM9261_SRAM_BASE, AT91SAM9261_SRAM_SIZE);

}



static void __init at91sam9261_initialize(void)

{

	arm_pm_idle = at91sam9_idle;

}



AT91_SOC_START(at91sam9261)

	.map_io = at91sam9261_map_io,

	.init = at91sam9261_initialize,

AT91_SOC_END

arch/arm/mach-at91/at91sam9263.c

+0 −7
Original line number Diff line number Diff line
@@ -20,18 +20,11 @@ 
 *  AT91SAM9263 processor initialization

 * -------------------------------------------------------------------- */



static void __init at91sam9263_map_io(void)

{

	at91_init_sram(0, AT91SAM9263_SRAM0_BASE, AT91SAM9263_SRAM0_SIZE);

	at91_init_sram(1, AT91SAM9263_SRAM1_BASE, AT91SAM9263_SRAM1_SIZE);

}



static void __init at91sam9263_initialize(void)

{

	arm_pm_idle = at91sam9_idle;

}



AT91_SOC_START(at91sam9263)

	.map_io = at91sam9263_map_io,

	.init = at91sam9263_initialize,

AT91_SOC_END

arch/arm/mach-at91/at91sam9g45.c

+0 −7
Original line number Diff line number Diff line
@@ -19,18 +19,11 @@ 
/* --------------------------------------------------------------------

 *  AT91SAM9G45 processor initialization

 * -------------------------------------------------------------------- */



static void __init at91sam9g45_map_io(void)

{

	at91_init_sram(0, AT91SAM9G45_SRAM_BASE, AT91SAM9G45_SRAM_SIZE);

}



static void __init at91sam9g45_initialize(void)

{

	arm_pm_idle = at91sam9_idle;

}



AT91_SOC_START(at91sam9g45)

	.map_io = at91sam9g45_map_io,

	.init = at91sam9g45_initialize,

AT91_SOC_END