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 'slub/lockless' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
board-kafa.c
diff --git
a/arch/arm/mach-at91/board-kafa.c
b/arch/arm/mach-at91/board-kafa.c
index
d2e1f4e
..
4a17089
100644
(file)
--- a/
arch/arm/mach-at91/board-kafa.c
+++ b/
arch/arm/mach-at91/board-kafa.c
@@
-35,14
+35,18
@@
#include <mach/board.h>
#include <mach/gpio.h>
#include <mach/board.h>
#include <mach/gpio.h>
+#include <mach/cpu.h>
#include "generic.h"
#include "generic.h"
-static void __init kafa_
map_io
(void)
+static void __init kafa_
init_early
(void)
{
{
+ /* Set cpu type: PQFP */
+ at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
+
/* Initialize processor: 18.432 MHz crystal */
/* Initialize processor: 18.432 MHz crystal */
- at91
rm9200_initialize(18432000, AT91RM9200_PQFP
);
+ at91
_initialize(18432000
);
/* Set up the LEDs */
at91_init_leds(AT91_PIN_PB4, AT91_PIN_PB4);
/* Set up the LEDs */
at91_init_leds(AT91_PIN_PB4, AT91_PIN_PB4);
@@
-57,11
+61,6
@@
static void __init kafa_map_io(void)
at91_set_serial_console(0);
}
at91_set_serial_console(0);
}
-static void __init kafa_init_irq(void)
-{
- at91rm9200_init_interrupts(NULL);
-}
-
static struct at91_eth_data __initdata kafa_eth_data = {
.phy_irq_pin = AT91_PIN_PC4,
.is_rmii = 0,
static struct at91_eth_data __initdata kafa_eth_data = {
.phy_irq_pin = AT91_PIN_PC4,
.is_rmii = 0,
@@
-94,9
+93,9
@@
static void __init kafa_board_init(void)
MACHINE_START(KAFA, "Sperry-Sun KAFA")
/* Maintainer: Sergei Sharonov */
MACHINE_START(KAFA, "Sperry-Sun KAFA")
/* Maintainer: Sergei Sharonov */
- .boot_params = AT91_SDRAM_BASE + 0x100,
.timer = &at91rm9200_timer,
.timer = &at91rm9200_timer,
- .map_io = kafa_map_io,
- .init_irq = kafa_init_irq,
+ .map_io = at91_map_io,
+ .init_early = kafa_init_early,
+ .init_irq = at91_init_irq_default,
.init_machine = kafa_board_init,
MACHINE_END
.init_machine = kafa_board_init,
MACHINE_END