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

[oweals/u-boot.git] / board / davedenx / qong / fpga.c

diff --git a/board/davedenx/qong/fpga.c b/board/davedenx/qong/fpga.c
index f865eb422563142a71a692bf83e301d0a69789ee..6536a0b6952a2b3532d8e4fea7f8e7d0c5b0e59f 100644 (file)
--- a/board/davedenx/qong/fpga.c
+++ b/board/davedenx/qong/fpga.c
@@ -23,9 +23,9 @@
  */
 
 #include <common.h>
-#include <asm/arch/mx31.h>
-#include <asm/arch/mx31-regs.h>
-#include <mxc_gpio.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/gpio.h>
 #include <fpga.h>
 #include <lattice.h>
 #include "qong_fpga.h"
@@ -41,22 +41,22 @@ static void qong_jtag_init(void)
 
 static void qong_fpga_jtag_set_tdi(int value)
 {
-       mxc_gpio_set(QONG_FPGA_TDI_PIN, value);
+       gpio_set_value(QONG_FPGA_TDI_PIN, value);
 }
 
 static void qong_fpga_jtag_set_tms(int value)
 {
-       mxc_gpio_set(QONG_FPGA_TMS_PIN, value);
+       gpio_set_value(QONG_FPGA_TMS_PIN, value);
 }
 
 static void qong_fpga_jtag_set_tck(int value)
 {
-       mxc_gpio_set(QONG_FPGA_TCK_PIN, value);
+       gpio_set_value(QONG_FPGA_TCK_PIN, value);
 }
 
 static int qong_fpga_jtag_get_tdo(void)
 {
-       return mxc_gpio_get(QONG_FPGA_TDO_PIN);
+       return gpio_get_value(QONG_FPGA_TDO_PIN);
 }
 
 lattice_board_specific_func qong_fpga_fns = {
@@ -92,4 +92,3 @@ int qong_fpga_init(void)
 }
 
 #endif
-