]> git.karo-electronics.de Git - karo-tx-uboot.git/commitdiff
fpga: Change the first parameter in fpga_loadbitstream
authorMichal Simek <michal.simek@xilinx.com>
Wed, 1 May 2013 17:02:02 +0000 (19:02 +0200)
committerMichal Simek <michal.simek@xilinx.com>
Mon, 6 May 2013 08:41:20 +0000 (10:41 +0200)
All fpga functions use devnum as int. Only fpga_loadbitstream
is using it as unsinged long dev.
This patch synchronize it.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Tom Rini <trini@ti.com>
drivers/fpga/fpga.c
drivers/fpga/xilinx.c
include/fpga.h

index f0253bff0f653c12a936652c13835b8124cd25bd..244f503240170632eeeb9eea6fa7c15d53a6282b 100644 (file)
@@ -190,7 +190,7 @@ int fpga_add(fpga_type devtype, void *desc)
 /*
  * Convert bitstream data and load into the fpga
  */
-int __weak fpga_loadbitstream(unsigned long dev, char *fpgadata, size_t size)
+int __weak fpga_loadbitstream(int devnum, char *fpgadata, size_t size)
 {
        printf("Bitstream support not implemented for this FPGA device\n");
        return FPGA_FAIL;
index 7d0342a4d142bbea896b3cd2d0c26a5315935c43..df5f9bf919bc4bff66b6e0fbb474062aa2bb9b33 100644 (file)
@@ -48,7 +48,7 @@ static int xilinx_validate (Xilinx_desc * desc, char *fn);
 
 /* ------------------------------------------------------------------------- */
 
-int fpga_loadbitstream(unsigned long dev, char *fpgadata, size_t size)
+int fpga_loadbitstream(int devnum, char *fpgadata, size_t size)
 {
        unsigned int length;
        unsigned int swapsize;
@@ -131,7 +131,7 @@ int fpga_loadbitstream(unsigned long dev, char *fpgadata, size_t size)
        dataptr += 4;
        printf("  bytes in bitstream = %d\n", swapsize);
 
-       return fpga_load(dev, dataptr, swapsize);
+       return fpga_load(devnum, dataptr, swapsize);
 }
 
 int xilinx_load(Xilinx_desc *desc, const void *buf, size_t bsize)
index 0d01e040db26f5f8245861499a08cc94a7420b88..38f62c0c2aaeff9cda1ea758fe54ef3f039328a1 100644 (file)
@@ -68,7 +68,7 @@ extern void fpga_init(void);
 extern int fpga_add(fpga_type devtype, void *desc);
 extern int fpga_count(void);
 extern int fpga_load(int devnum, const void *buf, size_t bsize);
-extern int fpga_loadbitstream(unsigned long dev, char *fpgadata, size_t size);
+extern int fpga_loadbitstream(int devnum, char *fpgadata, size_t size);
 extern int fpga_dump(int devnum, const void *buf, size_t bsize);
 extern int fpga_info(int devnum);