Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx

[u-boot] / board / logicpd / zoom2 / debug_board.c

diff --git a/board/logicpd/zoom2/debug_board.c b/board/logicpd/zoom2/debug_board.c
index a4ddf29294b20e99d1fd33b9dae83bbba67a5884..071f41074ba11772f0e0599dd14f9fb3d34f7a0e 100644 (file)
--- a/board/logicpd/zoom2/debug_board.c
+++ b/board/logicpd/zoom2/debug_board.c
@@ -2,27 +2,13 @@
  * Copyright (c) 2009 Wind River Systems, Inc.
  * Tom Rix <Tom.Rix@windriver.com>
  *
- * 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 <asm/arch/cpu.h>
 #include <asm/io.h>
 #include <asm/arch/mux.h>
-#include <asm/arch/gpio.h>
+#include <asm/gpio.h>
 
 #define DEBUG_BOARD_CONNECTED          1
 #define DEBUG_BOARD_NOT_CONNECTED      0
@@ -33,14 +19,13 @@ static void zoom2_debug_board_detect (void)
 {
        int val = 0;
 
-       if (!omap_request_gpio(158)) {
+       if (!gpio_request(158, "")) {
                /*
                 * GPIO to query for debug board
                 * 158 db board query
                 */
-               omap_set_gpio_direction(158, 1);
-               val = omap_get_gpio_datain(158);
-               omap_free_gpio(158);
+               gpio_direction_input(158);
+               val = gpio_get_value(158);
        }
 
        if (!val)