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 'apei' into apei-release
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
board-carmeva.c
diff --git
a/arch/arm/mach-at91/board-carmeva.c
b/arch/arm/mach-at91/board-carmeva.c
index
f36b186
..
c578c5d
100644
(file)
--- a/
arch/arm/mach-at91/board-carmeva.c
+++ b/
arch/arm/mach-at91/board-carmeva.c
@@
-43,7
+43,7
@@
static void __init carmeva_init_early(void)
{
/* Initialize processor: 20.000 MHz crystal */
static void __init carmeva_init_early(void)
{
/* Initialize processor: 20.000 MHz crystal */
- at91
rm9200
_initialize(20000000);
+ at91_initialize(20000000);
/* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0);
/* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0);
@@
-57,11
+57,6
@@
static void __init carmeva_init_early(void)
at91_set_serial_console(0);
}
at91_set_serial_console(0);
}
-static void __init carmeva_init_irq(void)
-{
- at91rm9200_init_interrupts(NULL);
-}
-
static struct at91_eth_data __initdata carmeva_eth_data = {
.phy_irq_pin = AT91_PIN_PC4,
.is_rmii = 1,
static struct at91_eth_data __initdata carmeva_eth_data = {
.phy_irq_pin = AT91_PIN_PC4,
.is_rmii = 1,
@@
-163,8
+158,8
@@
static void __init carmeva_board_init(void)
MACHINE_START(CARMEVA, "Carmeva")
/* Maintainer: Conitec Datasystems */
.timer = &at91rm9200_timer,
MACHINE_START(CARMEVA, "Carmeva")
/* Maintainer: Conitec Datasystems */
.timer = &at91rm9200_timer,
- .map_io = at91
rm9200
_map_io,
+ .map_io = at91_map_io,
.init_early = carmeva_init_early,
.init_early = carmeva_init_early,
- .init_irq =
carmeva_init_irq
,
+ .init_irq =
at91_init_irq_default
,
.init_machine = carmeva_board_init,
MACHINE_END
.init_machine = carmeva_board_init,
MACHINE_END