diff options
| author | Alan Tull <atull@kernel.org> | 2017-11-15 14:20:26 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-28 16:30:38 +0100 |
| commit | 8a54167925341ab2a9c3133618dbddfc1a46f8aa (patch) | |
| tree | 2244aa5db47f75bd5bc2801c1261b68cf548d863 /drivers/fpga/of-fpga-region.c | |
| parent | ef3acdd820752e0abb5f1ec899025967d0dccf3d (diff) | |
| download | blackbird-op-linux-8a54167925341ab2a9c3133618dbddfc1a46f8aa.tar.gz blackbird-op-linux-8a54167925341ab2a9c3133618dbddfc1a46f8aa.zip | |
fpga: of-fpga-region: accept overlays that don't program FPGA
The FPGA may already have a static image programmed when
Linux boots. In that case a DT overlay may be used to add
the devices that already exist. This commit allows that
by shuffling the order of some checks.
Signed-off-by: Alan Tull <atull@kernel.org>
Acked-by: Moritz Fischer <mdf@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/fpga/of-fpga-region.c')
| -rw-r--r-- | drivers/fpga/of-fpga-region.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/fpga/of-fpga-region.c b/drivers/fpga/of-fpga-region.c index 1533506ef0e4..c6b21194dcbc 100644 --- a/drivers/fpga/of-fpga-region.c +++ b/drivers/fpga/of-fpga-region.c @@ -298,18 +298,19 @@ static int of_fpga_region_notify_pre_apply(struct fpga_region *region, struct fpga_image_info *info; int ret; - if (region->info) { - dev_err(dev, "Region already has overlay applied.\n"); - return -EINVAL; - } - info = of_fpga_region_parse_ov(region, nd->overlay); if (IS_ERR(info)) return PTR_ERR(info); + /* If overlay doesn't program the FPGA, accept it anyway. */ if (!info) return 0; + if (region->info) { + dev_err(dev, "Region already has overlay applied.\n"); + return -EINVAL; + } + region->info = info; ret = fpga_region_program_fpga(region); if (ret) { |
