git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
board-picotux200.c
diff --git
a/arch/arm/mach-at91/board-picotux200.c
b/arch/arm/mach-at91/board-picotux200.c
index
55dad3a
..
756cc2a
100644
(file)
--- a/
arch/arm/mach-at91/board-picotux200.c
+++ b/
arch/arm/mach-at91/board-picotux200.c
@@
-43,10
+43,10
@@
#include "generic.h"
#include "generic.h"
-static void __init picotux200_
map_io
(void)
+static void __init picotux200_
init_early
(void)
{
/* Initialize processor: 18.432 MHz crystal */
{
/* Initialize processor: 18.432 MHz crystal */
- at91rm9200_initialize(18432000
, AT91RM9200_BGA
);
+ at91rm9200_initialize(18432000);
/* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0);
/* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0);
@@
-123,9
+123,9
@@
static void __init picotux200_board_init(void)
MACHINE_START(PICOTUX2XX, "picotux 200")
/* Maintainer: Kleinhenz Elektronik GmbH */
MACHINE_START(PICOTUX2XX, "picotux 200")
/* Maintainer: Kleinhenz Elektronik GmbH */
- .boot_params = AT91_SDRAM_BASE + 0x100,
.timer = &at91rm9200_timer,
.timer = &at91rm9200_timer,
- .map_io = picotux200_map_io,
+ .map_io = at91rm9200_map_io,
+ .init_early = picotux200_init_early,
.init_irq = picotux200_init_irq,
.init_machine = picotux200_board_init,
MACHINE_END
.init_irq = picotux200_init_irq,
.init_machine = picotux200_board_init,
MACHINE_END