1 files changed, 5 insertions, 11 deletions

diff --git a/arch/arm/mach-at91/board-stamp9g20.c b/arch/arm/mach-at91/board-stamp9g20.c
index 5e5c85688f5f..936e5fd7f406 100644
--- a/arch/arm/mach-at91/board-stamp9g20.c
+++ b/arch/arm/mach-at91/board-stamp9g20.c
@@ -35,7 +35,7 @@
 void __init stamp9g20_init_early(void)
 {
         /* Initialize processor: 18.432 MHz crystal */
-        at91sam9260_initialize(18432000);
+        at91_initialize(18432000);
 
         /* DGBU on ttyS0. (Rx & Tx only) */
         at91_register_uart(0, 0, 0);
@@ -76,12 +76,6 @@ static void __init portuxg20_init_early(void)
         at91_register_uart(AT91SAM9260_ID_US5, 6, 0);
 }
 
-static void __init init_irq(void)
-{
-        at91sam9260_init_interrupts(NULL);
-}
-
-
 /*
  * NAND flash
  */
@@ -299,17 +293,17 @@ static void __init stamp9g20evb_board_init(void)
 MACHINE_START(PORTUXG20, "taskit PortuxG20")
         /* Maintainer: taskit GmbH */
         .timer          = &at91sam926x_timer,
-        .map_io         = at91sam9260_map_io,
+        .map_io         = at91_map_io,
         .init_early     = portuxg20_init_early,
-        .init_irq       = init_irq,
+        .init_irq       = at91_init_irq_default,
         .init_machine   = portuxg20_board_init,
 MACHINE_END
 
 MACHINE_START(STAMP9G20, "taskit Stamp9G20")
         /* Maintainer: taskit GmbH */
         .timer          = &at91sam926x_timer,
-        .map_io         = at91sam9260_map_io,
+        .map_io         = at91_map_io,
         .init_early     = stamp9g20evb_init_early,
-        .init_irq       = init_irq,
+        .init_irq       = at91_init_irq_default,
         .init_machine   = stamp9g20evb_board_init,
 MACHINE_END