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

[<th...@us...>]

Revision: 1226
          http://armadeus.svn.sourceforge.net/armadeus/?rev=1226&view=rev
Author:   thom25
Date:     2009-04-16 07:34:57 +0000 (Thu, 16 Apr 2009)

Log Message:
-----------
[LINUX] cleanup (platform ressources externaly declared)

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-04-16 07:32:43 UTC (rev 1225)
+++ trunk/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c	2009-04-16 07:34:57 UTC (rev 1226)
@@ -25,10 +25,8 @@
 #include <linux/platform_device.h>
 
 #include "xilinx-fpga-loader.h"
+#include <mach/fpga.h>
 
-
-#define FPGA_BASE_ADDR CS5_BASE_ADDR
-
 #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   */
@@ -39,9 +37,6 @@
 #define CFG_FPGA_SUSPEND	(GPIO_PORTF | 10)	/* FPGA done pin  */
 #define CFG_FPGA_RESET		(GPIO_PORTF |  7)	/* FPGA done pin  */
 
-static void __iomem *fpga_addr;
-
-
 /* Initialize GPIO port before download */
 int apf27_fpga_pre(void)
 {
@@ -66,9 +61,6 @@
 
 	gpio_set_value(CFG_FPGA_RESET,1);
 	gpio_set_value(CFG_FPGA_PWR, 0);
-	fpga_addr = ioremap( FPGA_BASE_ADDR, 16);
-	if( fpga_addr == NULL ) 
-		return 0;
 	return 1;
 }
 
@@ -126,7 +118,7 @@
 
 int apf27_fpga_wdata( unsigned char data )
 {
-	__raw_writew(data, fpga_addr);
+	__raw_writew(data, ARMADEUS_FPGA_BASE_ADDR_VIRT);
 	return data;
 }
 
@@ -142,7 +134,8 @@
 	mxc_gpio_mode (CFG_FPGA_CLK | GPIO_PF | GPIO_PUEN);
 	gpio_set_value(CFG_FPGA_PRG, 1);
 	gpio_set_value(CFG_FPGA_RESET,0);
-	iounmap(fpga_addr);
+ 	mxc_gpio_mode (CFG_FPGA_RESET | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
+
 	return 1;
 }
 


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