Merge tag 'at91-for-next-soc' of git://github.com/at91linux/linux-at91 into at91/mci

[mirror_ubuntu-artful-kernel.git] / arch / arm / mach-at91 / board-sam9-l9260.c

diff --git a/arch/arm/mach-at91/board-sam9-l9260.c b/arch/arm/mach-at91/board-sam9-l9260.c
index 0af92e6cce64575eb92534f012e2af7e920a0ad5..c5f01acce3c03bb057f5df5c460b92f466185fac 100644 (file)
--- a/arch/arm/mach-at91/board-sam9-l9260.c
+++ b/arch/arm/mach-at91/board-sam9-l9260.c
@@ -38,6 +38,7 @@
 #include <asm/mach/irq.h>
 
 #include <mach/board.h>
+#include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 
 #include "sam9_smc.h"
@@ -165,11 +166,26 @@ static struct mci_platform_data __initdata ek_mci0_data = {
        },
 };
 
+/*
+ * LEDs
+ */
+static struct gpio_led ek_leds[] = {
+       {       /* D1 */
+               .name                   = "led1",
+               .gpio                   = AT91_PIN_PA9,
+               .active_low             = 1,
+               .default_trigger        = "heartbeat",
+       },
+       {       /* D2 */
+               .name                   = "led2",
+               .gpio                   = AT91_PIN_PA6,
+               .active_low             = 1,
+               .default_trigger        = "timer",
+       }
+};
+
 static void __init ek_board_init(void)
 {
-       /* Setup the LEDs */
-       at91_init_leds(AT91_PIN_PA9, AT91_PIN_PA6);
-
        /* Serial */
        /* DBGU on ttyS0. (Rx & Tx only) */
        at91_register_uart(0, 0, 0);
@@ -196,12 +212,15 @@ static void __init ek_board_init(void)
        at91_add_device_mci(0, &ek_mci0_data);
        /* I2C */
        at91_add_device_i2c(NULL, 0);
+       /* LEDs */
+       at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
 }
 
 MACHINE_START(SAM9_L9260, "Olimex SAM9-L9260")
        /* Maintainer: Olimex */
        .timer          = &at91sam926x_timer,
        .map_io         = at91_map_io,
+       .handle_irq     = at91_aic_handle_irq,
        .init_early     = ek_init_early,
        .init_irq       = at91_init_irq_default,
        .init_machine   = ek_board_init,