Merge branch 'u-boot/master' into u-boot-arm/master

[karo-tx-uboot.git] / board / ti / beagle / led.c

diff --git a/board/ti/beagle/led.c b/board/ti/beagle/led.c
index 08f95a0a16782c8a4121030eff3b645bb154365d..89b8dd3c3c1ee015be657b27372bc5c2176cc634 100644 (file)
--- a/board/ti/beagle/led.c
+++ b/board/ti/beagle/led.c
@@ -2,41 +2,26 @@
  * Copyright (c) 2010 Texas Instruments, Inc.
  * Jason Kridner <jkridner@beagleboard.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
 #include <status_led.h>
 #include <asm/arch/cpu.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/arch/gpio.h>
-
-static unsigned int saved_state[2] = {STATUS_LED_OFF, STATUS_LED_OFF};
+#include <asm/gpio.h>
 
 /* GPIO pins for the LEDs */
-#define BEAGLE_LED_USR0        149
-#define BEAGLE_LED_USR1        150
+#define BEAGLE_LED_USR0        150
+#define BEAGLE_LED_USR1        149
 
 #ifdef STATUS_LED_GREEN
-void green_LED_off (void)
+void green_led_off(void)
 {
        __led_set (STATUS_LED_GREEN, 0);
 }
 
-void green_LED_on (void)
+void green_led_on(void)
 {
        __led_set (STATUS_LED_GREEN, 1);
 }
@@ -49,42 +34,40 @@ void __led_init (led_id_t mask, int state)
 
 void __led_toggle (led_id_t mask)
 {
+       int state, toggle_gpio = 0;
 #ifdef STATUS_LED_BIT
-       if (STATUS_LED_BIT & mask) {
-               if (STATUS_LED_ON == saved_state[0])
-                       __led_set(STATUS_LED_BIT, 0);
-               else
-                       __led_set(STATUS_LED_BIT, 1);
-       }
+       if (!toggle_gpio && STATUS_LED_BIT & mask)
+               toggle_gpio = BEAGLE_LED_USR0;
 #endif
 #ifdef STATUS_LED_BIT1
-       if (STATUS_LED_BIT1 & mask) {
-               if (STATUS_LED_ON == saved_state[1])
-                       __led_set(STATUS_LED_BIT1, 0);
-               else
-                       __led_set(STATUS_LED_BIT1, 1);
-       }
+       if (!toggle_gpio && STATUS_LED_BIT1 & mask)
+               toggle_gpio = BEAGLE_LED_USR1;
 #endif
+       if (toggle_gpio) {
+               if (!gpio_request(toggle_gpio, "")) {
+                       gpio_direction_output(toggle_gpio, 0);
+                       state = gpio_get_value(toggle_gpio);
+                       gpio_set_value(toggle_gpio, !state);
+               }
+       }
 }
 
 void __led_set (led_id_t mask, int state)
 {
 #ifdef STATUS_LED_BIT
        if (STATUS_LED_BIT & mask) {
-               if (!omap_request_gpio(BEAGLE_LED_USR0)) {
-                       omap_set_gpio_direction(BEAGLE_LED_USR0, 0);
-                       omap_set_gpio_dataout(BEAGLE_LED_USR0, state);
+               if (!gpio_request(BEAGLE_LED_USR0, "")) {
+                       gpio_direction_output(BEAGLE_LED_USR0, 0);
+                       gpio_set_value(BEAGLE_LED_USR0, state);
                }
-               saved_state[0] = state;
        }
 #endif
 #ifdef STATUS_LED_BIT1
        if (STATUS_LED_BIT1 & mask) {
-               if (!omap_request_gpio(BEAGLE_LED_USR1)) {
-                       omap_set_gpio_direction(BEAGLE_LED_USR1, 0);
-                       omap_set_gpio_dataout(BEAGLE_LED_USR1, state);
+               if (!gpio_request(BEAGLE_LED_USR1, "")) {
+                       gpio_direction_output(BEAGLE_LED_USR1, 0);
+                       gpio_set_value(BEAGLE_LED_USR1, state);
                }
-               saved_state[1] = state;
        }
 #endif
 }