diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:33:55 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:33:55 -0700 |
| commit | 8b1a13b02812b60b88920801363920956691feb3 (patch) | |
| tree | cf140e1dfd5754aef0a59003cf9266aad003b8f5 /arch/arm/mach-at91/board-kafa.c | |
| parent | 5c008d7029fcd12a9a54fa618781b71353f6c4bd (diff) | |
| parent | 04ef037c926ddb31088c976538e29eada4fd1490 (diff) | |
| download | blackbird-op-linux-8b1a13b02812b60b88920801363920956691feb3.tar.gz blackbird-op-linux-8b1a13b02812b60b88920801363920956691feb3.zip | |
Merge branch 'next/drivers' into HEAD
Conflicts:
arch/arm/boot/dts/omap4.dtsi
arch/arm/mach-clps711x/common.c
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-omap1/leds-h2p2-debug.c
arch/arm/mach-omap1/leds.c
arch/arm/mach-pnx4008/time.c
arch/arm/plat-omap/debug-leds.c
drivers/Makefile
drivers/bus/omap_l3_noc.c
Diffstat (limited to 'arch/arm/mach-at91/board-kafa.c')
| -rw-r--r-- | arch/arm/mach-at91/board-kafa.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/board-kafa.c b/arch/arm/mach-at91/board-kafa.c index 64c1dbf88a07..86050da3ba53 100644 --- a/arch/arm/mach-at91/board-kafa.c +++ b/arch/arm/mach-at91/board-kafa.c @@ -66,11 +66,20 @@ static struct at91_udc_data __initdata kafa_udc_data = { .pullup_pin = AT91_PIN_PB7, }; +/* + * LEDs + */ +static struct gpio_led kafa_leds[] = { + { /* D1 */ + .name = "led1", + .gpio = AT91_PIN_PB4, + .active_low = 1, + .default_trigger = "heartbeat", + }, +}; + static void __init kafa_board_init(void) { - /* Set up the LEDs */ - at91_init_leds(AT91_PIN_PB4, AT91_PIN_PB4); - /* Serial */ /* DBGU on ttyS0. (Rx & Tx only) */ at91_register_uart(0, 0, 0); @@ -88,6 +97,8 @@ static void __init kafa_board_init(void) at91_add_device_i2c(NULL, 0); /* SPI */ at91_add_device_spi(NULL, 0); + /* LEDs */ + at91_gpio_leds(kafa_leds, ARRAY_SIZE(kafa_leds)); } MACHINE_START(KAFA, "Sperry-Sun KAFA") |
