[Armadeus-commitlog] SF.net SVN: armadeus:[1354] trunk/target/linux/modules/fpga/dev_tools/ loader/apf27-fpga-loader.c

[<ar...@us...>]

Revision: 1354
          http://armadeus.svn.sourceforge.net/armadeus/?rev=1354&view=rev
Author:   artemys
Date:     2009-06-19 13:50:10 +0000 (Fri, 19 Jun 2009)

Log Message:
-----------
[LINUX] Makes fpgaloader compile again on APF27 (2.6.27 kernel)

Modified Paths:
--------------
    trunk/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c

Modified: trunk/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
===================================================================
--- trunk/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c	2009-06-18 22:18:11 UTC (rev 1353)
+++ trunk/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c	2009-06-19 13:50:10 UTC (rev 1354)
@@ -26,14 +26,19 @@
 #include <linux/delay.h>
 #include "xilinx-fpga-loader.h"
 #include <mach/fpga.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+#define mxc_gpio_setup_multiple_pins mxc_gpio_setup_multiple
+#define mxc_gpio_release_multiple_pins mxc_gpio_release_multiple
+#endif
 
 #define CFG_FPGA_PWR		(GPIO_PORTF | 19)	/* FPGA prog pin  */
 #define CFG_FPGA_PRG		(GPIO_PORTF | 11)	/* FPGA prog pin  */
 #define CFG_FPGA_CLK		(GPIO_PORTF | 15)	/* FPGA clk pin   */
 #define CFG_FPGA_INIT		(GPIO_PORTF | 12)	/* FPGA init pin  */
 #define CFG_FPGA_DONE		(GPIO_PORTF |  9)	/* FPGA done pin  */
-#define CFG_FPGA_RW			(GPIO_PORTF | 21)	/* FPGA done pin  */
-#define CFG_FPGA_CS			(GPIO_PORTF | 22)	/* FPGA done pin  */
+#define CFG_FPGA_RW		(GPIO_PORTF | 21)	/* FPGA done pin  */
+#define CFG_FPGA_CS		(GPIO_PORTF | 22)	/* FPGA done pin  */
 #define CFG_FPGA_SUSPEND	(GPIO_PORTF | 10)	/* FPGA done pin  */
 #define CFG_FPGA_RESET		(GPIO_PORTF |  7)	/* FPGA done pin  */
 
@@ -160,6 +165,8 @@
 	/* reset off */
 	gpio_set_value(CFG_FPGA_RESET,0);
  	mxc_gpio_mode (CFG_FPGA_RESET | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
+
+	return 0;
 }
 
 int apf27_fpga_abort(void)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.