IGEPv2: Use Red Led1 as Heartbeat if configured
Subsystems (3)
PATCH 2/2 IGEPv2: Use Red Led1 as Heartbeat if configured
If not configured it will be exported as normal GPIO led.
Signed-off-by Jonas Zetterberg <[email protected]>
--- arch/arm/mach-omap2/board-igep0020.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/board-igep0020.c +28 -2
@@ -16,6 +16,7 @@#include <linux/clk.h> #include <linux/io.h> #include <linux/gpio.h> +#include <linux/leds.h> #include <linux/interrupt.h> #include <linux/regulator/machine.h>
@@ -354,9 +355,34 @@ static void __init igep2_display_init(void) gpio_direction_output(IGEP2_GPIO_DVI_PUP, 1))pr_err ("IGEP v2: Could not obtain gpio GPIO_DVI_PUP\n" ); } +#ifdef CONFIG_LEDS_TRIGGERS +static struct gpio_led gpio_leds[] = { + { + .name ="GPIO_LED1_RED" , + .default_trigger ="heartbeat" , + .gpio =IGEP2_GPIO_LED1_RED , + }, +}; + +static struct gpio_led_platform_data gpio_leds_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_leds_info, + }, +}; +#endif static struct platform_device *igep2_devices[]__initdata = { &igep2_dss_device, +#ifdef CONFIG_LEDS_TRIGGERS + &leds_gpio, +#endif };static void __init igep2_init_irq (void )
@@ -462,14 +488,14 @@ static void __init igep2_init(void)gpio_set_value (IGEP2_GPIO_LED0_GREEN ,0 ); }else pr_warning ("IGEP v2: Could not obtain gpio GPIO_LED0_GREEN\n" ); - +#ifndef CONFIG_LEDS_TRIGGERS if ((gpio_request (IGEP2_GPIO_LED1_RED ,"GPIO_LED1_RED" ) ==0 ) && (gpio_direction_output (IGEP2_GPIO_LED1_RED ,1 ) ==0 )) {gpio_export (IGEP2_GPIO_LED1_RED ,0 );gpio_set_value (IGEP2_GPIO_LED1_RED ,0 ); }else pr_warning ("IGEP v2: Could not obtain gpio GPIO_LED1_RED\n" ); - +#endif /* GPIO W-LAN + Bluetooth combo module */ if ((gpio_request (IGEP2_GPIO_WIFI_NPD ,"GPIO_WIFI_NPD" ) ==0 ) && (gpio_direction_output (IGEP2_GPIO_WIFI_NPD ,1 ) ==0 )) {
Tony Lindgren
maintainerPATCH 2/2 IGEPv2: Use Red Led1 as Heartbeat if configured
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: for-next
Initial commit ID (Likely to change): 85ac89e2c373f6eef4908accf6afd5cbe2cd7c96
PatchWorks
http://patchwork.kernel.org/patch/79313/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=85ac89e2c373f6eef4908accf6afd5cbe2cd7c96