diff options
author | Tony Lindgren <tony@atomide.com> | 2010-09-27 10:19:44 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-09-27 10:19:44 -0700 |
commit | 98bb8c3e98267f2aa422bbafce3b734016e7ed02 (patch) | |
tree | 6f494fd5924d631691ec1ef73bd986ecff0539d9 /arch/arm/mach-omap2/board-omap4panda.c | |
parent | d58cc92bda765e62f28b12a8f4627ddee32978f0 (diff) | |
parent | 3da434acd4f7c7f5aeebd44fed42bf5ed9adfc44 (diff) | |
download | talos-op-linux-98bb8c3e98267f2aa422bbafce3b734016e7ed02.tar.gz talos-op-linux-98bb8c3e98267f2aa422bbafce3b734016e7ed02.zip |
Merge branch 'devel-boards' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-omap4panda.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 0bb2353b64a4..aa8296e7e9d4 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -20,6 +20,7 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/io.h> +#include <linux/leds.h> #include <linux/gpio.h> #include <linux/usb/otg.h> #include <linux/i2c/twl.h> @@ -40,6 +41,36 @@ #include "hsmmc.h" +static struct gpio_led gpio_leds[] = { + { + .name = "pandaboard::status1", + .default_trigger = "heartbeat", + .gpio = 7, + }, + { + .name = "pandaboard::status2", + .default_trigger = "mmc0", + .gpio = 8, + }, +}; + +static struct gpio_led_platform_data gpio_led_info = { + .leds = gpio_leds, + .num_leds = ARRAY_SIZE(gpio_leds), +}; + +static struct platform_device leds_gpio = { + .name = "leds-gpio", + .id = -1, + .dev = { + .platform_data = &gpio_led_info, + }, +}; + +static struct platform_device *panda_devices[] __initdata = { + &leds_gpio, +}; + static void __init omap4_panda_init_irq(void) { omap2_init_common_hw(NULL, NULL); @@ -275,6 +306,7 @@ static int __init omap4_panda_i2c_init(void) static void __init omap4_panda_init(void) { omap4_panda_i2c_init(); + platform_add_devices(panda_devices, ARRAY_SIZE(panda_devices)); omap_serial_init(); omap4_twl6030_hsmmc_init(mmc); /* OMAP4 Panda uses internal transceiver so register nop transceiver */ |