diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-12-01 21:05:53 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-12-01 21:05:53 +0100 |
| commit | e073462966b26977b26937c5fc93b4fb24f04fef (patch) | |
| tree | 49221ed9ebf8e42ad5d80897e91286250f215e4a /include/linux | |
| 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 'include/linux')
| -rw-r--r-- | include/linux/fpga/fpga-mgr.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/fpga/fpga-mgr.h b/include/linux/fpga/fpga-mgr.h index 96a1a3311649..16551d5eac36 100644 --- a/include/linux/fpga/fpga-mgr.h +++ b/include/linux/fpga/fpga-mgr.h @@ -84,6 +84,7 @@ struct fpga_image_info { /** * struct fpga_manager_ops - ops for low level fpga manager drivers + * @initial_header_size: Maximum number of bytes that should be passed into write_init * @state: returns an enum value of the FPGA's state * @write_init: prepare the FPGA to receive confuration data * @write: write count bytes of configuration data to the FPGA @@ -95,6 +96,7 @@ struct fpga_image_info { * called, so leaving them out is fine. */ struct fpga_manager_ops { + size_t initial_header_size; enum fpga_mgr_states (*state)(struct fpga_manager *mgr); int (*write_init)(struct fpga_manager *mgr, struct fpga_image_info *info, |