aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/fpga/fpga-region.c
diff options
context:
space:
mode:
authorAlan Tull <atull@opensource.altera.com>2017-03-23 20:34:27 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-04-08 11:45:28 -0400
commit42d5ec954719917e2b7a9160fe05d2316eece5bf (patch)
tree19088b3704312ff5f8f6b4e2790e3963ebb2d4da /drivers/fpga/fpga-region.c
parent061c97d13f1a69c0edcab4dc6e97788e5bf3230f (diff)
fpga: add config complete timeout
Adding timeout for maximum allowed time for FPGA to go to operating mode after a FPGA region has been programmed. Signed-off-by: Alan Tull <atull@opensource.altera.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/fpga/fpga-region.c')
-rw-r--r--drivers/fpga/fpga-region.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c
index 2fe2a52c66ca..ae4c61aada99 100644
--- a/drivers/fpga/fpga-region.c
+++ b/drivers/fpga/fpga-region.c
@@ -385,6 +385,9 @@ static int fpga_region_notify_pre_apply(struct fpga_region *region,
385 of_property_read_u32(nd->overlay, "region-freeze-timeout-us", 385 of_property_read_u32(nd->overlay, "region-freeze-timeout-us",
386 &info->disable_timeout_us); 386 &info->disable_timeout_us);
387 387
388 of_property_read_u32(nd->overlay, "config-complete-timeout-us",
389 &info->config_complete_timeout_us);
390
388 /* If FPGA was externally programmed, don't specify firmware */ 391 /* If FPGA was externally programmed, don't specify firmware */
389 if ((info->flags & FPGA_MGR_EXTERNAL_CONFIG) && firmware_name) { 392 if ((info->flags & FPGA_MGR_EXTERNAL_CONFIG) && firmware_name) {
390 pr_err("error: specified firmware and external-fpga-config"); 393 pr_err("error: specified firmware and external-fpga-config");