Merge branch 'u-boot-ti/master' into 'u-boot-arm/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..3fedddc8b5a10829e43db3625108773d4933ffc5 100644 (file)
--- a/drivers/misc/gpio_led.c
+++ b/drivers/misc/gpio_led.c
@@ -2,26 +2,22 @@
  * 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 */
-
 void __led_init(led_id_t mask, int state)
 {
-       gpio_direction_output(mask, (state == STATUS_LED_ON) ? 0 : 1);
+       gpio_request(mask, "gpio_led");
+       gpio_direction_output(mask, state == STATUS_LED_ON);
 }
 
 void __led_set(led_id_t mask, int state)
 {
-       gpio_set_value(mask, (state == STATUS_LED_ON) ? 0 : 1);
+       gpio_set_value(mask, state == STATUS_LED_ON);
 }
 
 void __led_toggle(led_id_t mask)