diff options
Diffstat (limited to 'drivers/firmware/socfpga.c')
| -rw-r--r-- | drivers/firmware/socfpga.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/firmware/socfpga.c b/drivers/firmware/socfpga.c index 79c63eb77c..a0cd2011cb 100644 --- a/drivers/firmware/socfpga.c +++ b/drivers/firmware/socfpga.c @@ -395,6 +395,7 @@ static int programmed_get(struct param_d *p, void *priv) static int fpgamgr_probe(struct device_d *dev) { + struct resource *iores; struct fpgamgr *mgr; struct firmware_handler *fh; const char *alias = of_alias_get(dev->device_node); @@ -407,17 +408,19 @@ static int fpgamgr_probe(struct device_d *dev) mgr = xzalloc(sizeof(*mgr)); fh = &mgr->fh; - mgr->regs = dev_request_mem_region(dev, 0); - if (IS_ERR(mgr->regs)) { - ret = PTR_ERR(mgr->regs); + iores = dev_request_mem_resource(dev, 0); + if (IS_ERR(iores)) { + ret = PTR_ERR(iores); goto out; } + mgr->regs = IOMEM(iores->start); - mgr->regs_data = dev_request_mem_region(dev, 1); - if (IS_ERR(mgr->regs_data)) { - ret = PTR_ERR(mgr->regs_data); + iores = dev_request_mem_resource(dev, 1); + if (IS_ERR(iores)) { + ret = PTR_ERR(iores); goto out; } + mgr->regs_data = IOMEM(iores->start); if (alias) fh->id = xstrdup(alias); |