Merge branch 'master' of git://git.denx.de/u-boot-arm into master

[karo-tx-uboot.git] / drivers / misc / gpio_led.c

diff --git a/drivers/misc/gpio_led.c b/drivers/misc/gpio_led.c
index acd6a90127de1e4593ac09b2489a70377f0a40e4..3e95727d798309bf9125f5d0f722334174062b3b 100644 (file)
--- a/drivers/misc/gpio_led.c
+++ b/drivers/misc/gpio_led.c
@@ -2,26 +2,49 @@
  * Status LED driver based on GPIO access conventions of Linux
  *
  * Copyright (C) 2010 Thomas Chou <thomas@wytron.com.tw>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * Licensed under the GPL-2 or later.
  */
 
 #include <common.h>
 #include <status_led.h>
 #include <asm/gpio.h>
 
-/* assume led is active low */
+#ifndef CONFIG_GPIO_LED_INVERTED_TABLE
+#define CONFIG_GPIO_LED_INVERTED_TABLE {}
+#endif
+
+static led_id_t gpio_led_inv[] = CONFIG_GPIO_LED_INVERTED_TABLE;
+
+static int gpio_led_gpio_value(led_id_t mask, int state)
+{
+       int i, gpio_value = (state == STATUS_LED_ON);
+
+       for (i = 0; i < ARRAY_SIZE(gpio_led_inv); i++) {
+               if (gpio_led_inv[i] == mask)
+                       gpio_value = !gpio_value;
+       }
+
+       return gpio_value;
+}
 
 void __led_init(led_id_t mask, int state)
 {
-       gpio_direction_output(mask, (state == STATUS_LED_ON) ? 0 : 1);
+       int gpio_value;
+
+       if (gpio_request(mask, "gpio_led") != 0) {
+               printf("%s: failed requesting GPIO%lu!\n", __func__, mask);
+               return;
+       }
+
+       gpio_value = gpio_led_gpio_value(mask, state);
+       gpio_direction_output(mask, gpio_value);
 }
 
 void __led_set(led_id_t mask, int state)
 {
-       gpio_set_value(mask, (state == STATUS_LED_ON) ? 0 : 1);
+       int gpio_value = gpio_led_gpio_value(mask, state);
+
+       gpio_set_value(mask, gpio_value);
 }
 
 void __led_toggle(led_id_t mask)