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

Commit 1b021a3b authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD
Browse files

at91: fix map_io init usage 



switch early init to init_early and introduce soc map_io

with this Patch we will not do any more early device setup during the map io

tks to Russell to point the new call back

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Patrice Vilchez <patrice.vilchez@atmel.com>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Acked-by: default avatarAndrew Victor <linux@maxim.org.za>
parent 1cef3e15

arch/arm/mach-at91/at572d940hf.c

+4 −1
Original line number Diff line number Diff line
@@ -302,11 +302,14 @@ static void at572d940hf_reset(void) 
 *  AT572D940HF processor initialization

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



void __init at572d940hf_initialize(unsigned long main_clock)

void __init at572d940hf_map_io(void)

{

	/* Map peripherals */

	iotable_init(at572d940hf_io_desc, ARRAY_SIZE(at572d940hf_io_desc));

}



void __init at572d940hf_initialize(unsigned long main_clock)

{

	at91_arch_reset = at572d940hf_reset;

	at91_extern_irq = (1 << AT572D940HF_ID_IRQ0) | (1 << AT572D940HF_ID_IRQ1)

			| (1 << AT572D940HF_ID_IRQ2);

arch/arm/mach-at91/at91cap9.c

+4 −1
Original line number Diff line number Diff line
@@ -303,11 +303,14 @@ static void at91cap9_poweroff(void) 
 *  AT91CAP9 processor initialization

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



void __init at91cap9_initialize(unsigned long main_clock)

void __init at91cap9_map_io(void)

{

	/* Map peripherals */

	iotable_init(at91cap9_io_desc, ARRAY_SIZE(at91cap9_io_desc));

}



void __init at91cap9_initialize(unsigned long main_clock)

{

	at91_arch_reset = at91cap9_reset;

	pm_power_off = at91cap9_poweroff;

	at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1);

arch/arm/mach-at91/at91rm9200.c

+4 −1
Original line number Diff line number Diff line
@@ -270,11 +270,14 @@ static void at91rm9200_reset(void) 
/* --------------------------------------------------------------------

 *  AT91RM9200 processor initialization

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

void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks)

void __init at91rm9200_map_io(void)

{

	/* Map peripherals */

	iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc));

}



void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks)

{

	at91_arch_reset = at91rm9200_reset;

	at91_extern_irq = (1 << AT91RM9200_ID_IRQ0) | (1 << AT91RM9200_ID_IRQ1)

			| (1 << AT91RM9200_ID_IRQ2) | (1 << AT91RM9200_ID_IRQ3)

arch/arm/mach-at91/at91sam9260.c

+6 −3
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static void at91sam9260_poweroff(void) 
 *  AT91SAM9260 processor initialization

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



static void __init at91sam9xe_initialize(void)

static void __init at91sam9xe_map_io(void)

{

	unsigned long cidr, sram_size;
@@ -310,18 +310,21 @@ static void __init at91sam9xe_initialize(void) 
	iotable_init(at91sam9xe_sram_desc, ARRAY_SIZE(at91sam9xe_sram_desc));

}



void __init at91sam9260_initialize(unsigned long main_clock)

void __init at91sam9260_map_io(void)

{

	/* Map peripherals */

	iotable_init(at91sam9260_io_desc, ARRAY_SIZE(at91sam9260_io_desc));



	if (cpu_is_at91sam9xe())

		at91sam9xe_initialize();

		at91sam9xe_map_io();

	else if (cpu_is_at91sam9g20())

		iotable_init(at91sam9g20_sram_desc, ARRAY_SIZE(at91sam9g20_sram_desc));

	else

		iotable_init(at91sam9260_sram_desc, ARRAY_SIZE(at91sam9260_sram_desc));

}



void __init at91sam9260_initialize(unsigned long main_clock)

{

	at91_arch_reset = at91sam9_alt_reset;

	pm_power_off = at91sam9260_poweroff;

	at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1)

arch/arm/mach-at91/at91sam9261.c

+4 −2
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static void at91sam9261_poweroff(void) 
 *  AT91SAM9261 processor initialization

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



void __init at91sam9261_initialize(unsigned long main_clock)

void __init at91sam9261_map_io(void)

{

	/* Map peripherals */

	iotable_init(at91sam9261_io_desc, ARRAY_SIZE(at91sam9261_io_desc));
@@ -276,8 +276,10 @@ void __init at91sam9261_initialize(unsigned long main_clock) 
		iotable_init(at91sam9g10_sram_desc, ARRAY_SIZE(at91sam9g10_sram_desc));

	else

		iotable_init(at91sam9261_sram_desc, ARRAY_SIZE(at91sam9261_sram_desc));

}





void __init at91sam9261_initialize(unsigned long main_clock)

{

	at91_arch_reset = at91sam9_alt_reset;

	pm_power_off = at91sam9261_poweroff;

	at91_extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1)