diff options
Diffstat (limited to 'arch/arm/mach-tegra')
| -rw-r--r-- | arch/arm/mach-tegra/tegra20-pmc.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/tegra20-timer.c | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/tegra20-pmc.c b/arch/arm/mach-tegra/tegra20-pmc.c index 02f0bf7499..f7c7ac918f 100644 --- a/arch/arm/mach-tegra/tegra20-pmc.c +++ b/arch/arm/mach-tegra/tegra20-pmc.c @@ -202,11 +202,13 @@ static void tegra20_pmc_detect_reset_cause(void) static int tegra20_pmc_probe(struct device_d *dev) { - pmc_base = dev_request_mem_region(dev, 0); - if (IS_ERR(pmc_base)) { + struct resource *iores; + iores = dev_request_mem_resource(dev, 0); + if (IS_ERR(iores)) { dev_err(dev, "could not get memory region\n"); - return PTR_ERR(pmc_base); + return PTR_ERR(iores); } + pmc_base = IOMEM(iores->start); tegra_powergate_init(); diff --git a/arch/arm/mach-tegra/tegra20-timer.c b/arch/arm/mach-tegra/tegra20-timer.c index a8e4d7b53d..2ba58bd65e 100644 --- a/arch/arm/mach-tegra/tegra20-timer.c +++ b/arch/arm/mach-tegra/tegra20-timer.c @@ -45,17 +45,19 @@ static struct clocksource cs = { static int tegra20_timer_probe(struct device_d *dev) { + struct resource *iores; u32 reg; /* use only one timer */ if (timer_base) return -EBUSY; - timer_base = dev_request_mem_region(dev, 0); - if (IS_ERR(timer_base)) { + iores = dev_request_mem_resource(dev, 0); + if (IS_ERR(iores)) { dev_err(dev, "could not get memory region\n"); - return PTR_ERR(timer_base); + return PTR_ERR(iores); } + timer_base = IOMEM(iores->start); /* * calibrate timer to run at 1MHz |