From: Greg Kroah-Hartman Date: Fri, 15 May 2020 14:09:24 +0000 (+0200) Subject: Merge tag 'fpga-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f877a18c08fa6674364e469f318a3069c68204d2;p=linux.git Merge tag 'fpga-for-5.8' of git://git./linux/kernel/git/mdf/linux-fpga into char-misc-next Moritz writes: FPGA Manager changes for 5.8 Here's the first set of changes for the 5.8-rc1 merge window. Dominic's change adds support for accessing AFU regions with gdb. Gustavo's change is a cleanup patch regarding variable lenght arrays. Richard's changes update dt-bindings and add support for stratix and agilex. Sergiu's changes update spi transfers with the new delay field. Xu's change addresses an issue with a wrong return value. Shubhrajyoti's change makes the Zynq FPGA driver return -EPROBE_DEFER on check of devm_clk_get failure. Xu's change for DFL enables multiple opens. All of these patches have been reviewed, have appropriate Acked-by's and have been in the last few linux-next releases without issues. Signed-off-by: Moritz Fischer * tag 'fpga-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga: fpga: dfl: afu: support debug access to memory-mapped afu regions fpga: dfl.h: Replace zero-length array with flexible-array member arm64: dts: agilex: correct service layer driver's compatible value dt-bindings, firmware: add compatible value Intel Stratix10 service layer binding fpga: stratix10-soc: add compatible property value for intel agilex arm64: dts: agilex: correct FPGA manager driver's compatible value dt-bindings: fpga: add compatible value to Stratix10 SoC FPGA manager binding fpga: machxo2-spi: Use new structure for SPI transfer delays fpga: ice40-spi: Use new structure for SPI transfer delays fpga: dfl: support multiple opens on feature device node. --- f877a18c08fa6674364e469f318a3069c68204d2 diff --cc drivers/fpga/dfl.h index d312678a9aca7,74784d3cfe7c4..2f5d3052e36e0 --- a/drivers/fpga/dfl.h +++ b/drivers/fpga/dfl.h @@@ -204,11 -203,8 +204,9 @@@ struct dfl_feature int resource_index; void __iomem *ioaddr; const struct dfl_feature_ops *ops; + void *priv; }; - #define DEV_STATUS_IN_USE 0 - #define FEATURE_DEV_ID_UNUSED (-1) /**