diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-29 23:32:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-29 23:32:53 -0700 |
| commit | 8f57be8ee44d92ef161c5af685aedbb717db96e0 (patch) | |
| tree | d44a1cf0843390c6ff679f15e052ae1fc87680a8 /arch/arm/mach-at91/board-sam9260ek.c | |
| parent | cb7dee8d22f3e9320424e769d860fbd9712a0666 (diff) | |
| parent | fb149f9e2835446e02e796081635520b881dc351 (diff) | |
| download | talos-op-linux-8f57be8ee44d92ef161c5af685aedbb717db96e0.tar.gz talos-op-linux-8f57be8ee44d92ef161c5af685aedbb717db96e0.zip | |
Merge branch 'at91/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'at91/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
at91: add arch specific ioremap support
at91: factorize sram init
at91: move register clocks to soc generic init
at91: move clock subsystem init to soc generic init
at91: use structure to store the current soc
at91: remove AT91_DBGU offset from dbgu register macro
at91: factorize at91 interrupts init to soc
at91: introduce commom AT91_BASE_SYS
Diffstat (limited to 'arch/arm/mach-at91/board-sam9260ek.c')
| -rw-r--r-- | arch/arm/mach-at91/board-sam9260ek.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c index 5c240743c5b7..8a50c3e67186 100644 --- a/arch/arm/mach-at91/board-sam9260ek.c +++ b/arch/arm/mach-at91/board-sam9260ek.c @@ -53,7 +53,7 @@ static void __init ek_init_early(void) { /* Initialize processor: 18.432 MHz crystal */ - at91sam9260_initialize(18432000); + at91_initialize(18432000); /* DBGU on ttyS0. (Rx & Tx only) */ at91_register_uart(0, 0, 0); @@ -70,12 +70,6 @@ static void __init ek_init_early(void) at91_set_serial_console(0); } -static void __init ek_init_irq(void) -{ - at91sam9260_init_interrupts(NULL); -} - - /* * USB Host port */ @@ -354,8 +348,8 @@ static void __init ek_board_init(void) MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK") /* Maintainer: Atmel */ .timer = &at91sam926x_timer, - .map_io = at91sam9260_map_io, + .map_io = at91_map_io, .init_early = ek_init_early, - .init_irq = ek_init_irq, + .init_irq = at91_init_irq_default, .init_machine = ek_board_init, MACHINE_END |
