diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2011-04-23 03:28:34 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:07:28 -0400 |
commit | 21d08b9d5536ac418bbce4f419fe2b528b7ddf31 (patch) | |
tree | f1a1bbf5645d933799e31d93365458826dfadea6 /arch/arm/mach-at91/board-sam9g20ek.c | |
parent | 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff) |
at91: introduce commom AT91_BASE_SYS
On all at91 except rm9200 and x40 have the System Controller starts
at address 0xffffc000 and has a size of 16KiB.
On rm9200 it's start at 0xfffe4000 of 111KiB with non reserved data starting
at 0xfffff000
This patch removes the individual definitions of AT91_BASE_SYS and
replaces them with a common version at base 0xfffffc000 and size 16KiB
and map the same memory space
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Patrice Vilchez <patrice.vilchez@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/board-sam9g20ek.c')
-rw-r--r-- | arch/arm/mach-at91/board-sam9g20ek.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c index 1325a50101a8..98e026ad8b78 100644 --- a/arch/arm/mach-at91/board-sam9g20ek.c +++ b/arch/arm/mach-at91/board-sam9g20ek.c | |||
@@ -64,7 +64,7 @@ static int inline ek_have_2mmc(void) | |||
64 | static void __init ek_init_early(void) | 64 | static void __init ek_init_early(void) |
65 | { | 65 | { |
66 | /* Initialize processor: 18.432 MHz crystal */ | 66 | /* Initialize processor: 18.432 MHz crystal */ |
67 | at91sam9260_initialize(18432000); | 67 | at91_initialize(18432000); |
68 | 68 | ||
69 | /* DBGU on ttyS0. (Rx & Tx only) */ | 69 | /* DBGU on ttyS0. (Rx & Tx only) */ |
70 | at91_register_uart(0, 0, 0); | 70 | at91_register_uart(0, 0, 0); |
@@ -404,7 +404,7 @@ static void __init ek_board_init(void) | |||
404 | MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK") | 404 | MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK") |
405 | /* Maintainer: Atmel */ | 405 | /* Maintainer: Atmel */ |
406 | .timer = &at91sam926x_timer, | 406 | .timer = &at91sam926x_timer, |
407 | .map_io = at91sam9260_map_io, | 407 | .map_io = at91_map_io, |
408 | .init_early = ek_init_early, | 408 | .init_early = ek_init_early, |
409 | .init_irq = ek_init_irq, | 409 | .init_irq = ek_init_irq, |
410 | .init_machine = ek_board_init, | 410 | .init_machine = ek_board_init, |
@@ -413,7 +413,7 @@ MACHINE_END | |||
413 | MACHINE_START(AT91SAM9G20EK_2MMC, "Atmel AT91SAM9G20-EK 2 MMC Slot Mod") | 413 | MACHINE_START(AT91SAM9G20EK_2MMC, "Atmel AT91SAM9G20-EK 2 MMC Slot Mod") |
414 | /* Maintainer: Atmel */ | 414 | /* Maintainer: Atmel */ |
415 | .timer = &at91sam926x_timer, | 415 | .timer = &at91sam926x_timer, |
416 | .map_io = at91sam9260_map_io, | 416 | .map_io = at91_map_io, |
417 | .init_early = ek_init_early, | 417 | .init_early = ek_init_early, |
418 | .init_irq = ek_init_irq, | 418 | .init_irq = ek_init_irq, |
419 | .init_machine = ek_board_init, | 419 | .init_machine = ek_board_init, |