diff options
| author | Greg Kroah-Hartman <[email protected]> | 2016-12-01 21:05:53 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2016-12-01 21:05:53 +0100 |
| commit | e073462966b26977b26937c5fc93b4fb24f04fef (patch) | |
| tree | 49221ed9ebf8e42ad5d80897e91286250f215e4a /drivers/fpga/socfpga-a10.c | |
| parent | 31114fa95bdb815f52f0cb0fad1260bd91007563 (diff) | |
| parent | e499807737b75387bcc9d146927dc36a0b7e4cff (diff) | |
Merge tag 'fpga-for-greg-20161129' of git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga into char-misc-next
Alan writes:
fpga: Updates for 4.10
These are:
* Add git url to MAINTAINERS
* Allow write_init to specify how much buffer it needs
* Fixes for ISR state in zynq fpga manager driver
* Other small fixes for zynq
* Add Altera SoCFPGA drivers for COMPILE_TEST
Diffstat (limited to 'drivers/fpga/socfpga-a10.c')
| -rw-r--r-- | drivers/fpga/socfpga-a10.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/fpga/socfpga-a10.c b/drivers/fpga/socfpga-a10.c index ccd9fb23bd52..f8770af0f6b5 100644 --- a/drivers/fpga/socfpga-a10.c +++ b/drivers/fpga/socfpga-a10.c @@ -470,6 +470,7 @@ static enum fpga_mgr_states socfpga_a10_fpga_state(struct fpga_manager *mgr) } static const struct fpga_manager_ops socfpga_a10_fpga_mgr_ops = { + .initial_header_size = (RBF_DECOMPRESS_OFFSET + 1) * 4, .state = socfpga_a10_fpga_state, .write_init = socfpga_a10_fpga_write_init, .write = socfpga_a10_fpga_write, |