p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fpga: zynq-fpga: Change fw format to handle bin instead of bit. 

This gets rid of the code to strip away the header and byteswap,
as well as the check for the sync word.

Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
Reviewed-by: Josh Cartwright <joshc@ni.com>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Moritz Fischer 2015-10-20 10:19:56 -07:00 committed by Greg Kroah-Hartman
parent 6376931bab
commit 4d10eaff5b
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/fpga/zynq-fpga.c
View File

@ -287,9 +287,9 @@ static int zynq_fpga_ops_write(struct fpga_manager *mgr,
struct zynq_fpga_priv *priv;
int err;
char *kbuf;
size_t i, in_count;
size_t in_count;
dma_addr_t dma_addr;
u32 transfer_length = 0;
u32 transfer_length;
u32 intr_status;
in_count = count;
@ -301,26 +301,6 @@ static int zynq_fpga_ops_write(struct fpga_manager *mgr,
memcpy(kbuf, buf, count);
/* look for the sync word */
for (i = 0; i < count - 4; i++) {
if (memcmp(kbuf + i, "\xAA\x99\x55\x66", 4) == 0) {
dev_dbg(priv->dev, "Found swapped sync word\n");
break;
}
}
/* remove the header, align the data on word boundary */
if (i != count - 4) {
count -= i;
memmove(kbuf, kbuf + i, count);
}
/* fixup endianness of the data */
for (i = 0; i < count; i += 4) {
u32 *p = (u32 *)&kbuf[i];
*p = swab32(*p);
}
/* enable clock */
err = clk_enable(priv->clk);
if (err)