summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2017-03-30 20:46:35 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2017-03-31 08:08:21 +0200
commit4f31107b25ac10d9bac12bb4c3be5d238609f84c (patch)
treec5b89191dfb15f6ad7d8f6315e797c35a885a068 /drivers
parent65ecf17f72015848175650f110aed160e913e4e5 (diff)
downloadbarebox-4f31107b25ac10d9bac12bb4c3be5d238609f84c.tar.gz
barebox-4f31107b25ac10d9bac12bb4c3be5d238609f84c.tar.xz
clocksource: mvebu: don't request the used iomem resource
The register ranges of the device nodes timer@20300 and watchdog@20300 overlap, so it is impossible that both devices properly use request_iomem_region (e.g. by using dev_request_mem_resource). In Linux only the watchdog driver is registered in /proc/iomem, do the same for barebox. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/clocksource/mvebu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/mvebu.c b/drivers/clocksource/mvebu.c
index cf80571263..59bbc4be22 100644
--- a/drivers/clocksource/mvebu.c
+++ b/drivers/clocksource/mvebu.c
@@ -60,7 +60,7 @@ static int mvebu_timer_probe(struct device_d *dev)
struct clk *clk;
u32 rate, div, val;
- iores = dev_request_mem_resource(dev, 0);
+ iores = dev_get_resource(dev, IORESOURCE_MEM, 0);
if (IS_ERR(iores))
return PTR_ERR(iores);
timer_base = IOMEM(iores->start);