summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorAntony Pavlov <antonynpavlov@gmail.com>2015-01-09 12:41:37 +0300
committerSascha Hauer <s.hauer@pengutronix.de>2015-01-09 17:09:47 +0100
commitf9df80918d8047ae8019e653188901d60f341b98 (patch)
treed7526ec06393438484c67d799e916142d8a36203 /drivers/base
parent40662bbb59f18b489c7e2c7c41612f1c16582d2e (diff)
downloadbarebox-f9df80918d8047ae8019e653188901d60f341b98.tar.gz
barebox-f9df80918d8047ae8019e653188901d60f341b98.tar.xz
resource: dev_request_mem_region: fix return value for MIPS
The commit commit 0d7a21334536cb36b3c9b64d868acc55aec41332 Author: Antony Pavlov <antonynpavlov at gmail.com> Date: Wed Sep 10 11:42:19 2014 +0400 MIPS: dts: use physical addresses (as Linux does) With IOMEM() adapted for MIPS we can use physical addresses in device tree reg property. has switched MIPS dts files to physical addresses usage. The patch was tested on qemu, but qemu malta board is tolerant of using physical addresses for accesing to device (Ingenic JZ4755 and JZ4780 processors are tolerant too!). But other CPUs (e.g. Loongson LS1B) can throw an exception in this situation. Additional physical address to virtual address translation on MIPS is needed. We already have this in include/common.h #if defined(CONFIG_MIPS) #include <asm/addrspace.h> #define IOMEM(addr) ((void __force __iomem *)CKSEG1ADDR(addr)) #else #define IOMEM(addr) ((void __force __iomem *)(addr)) #endif So use IOMEM() to fix dev_request_mem_region() return value. Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index fd9c4d947c..81b35031a1 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -346,7 +346,7 @@ void __iomem *dev_request_mem_region(struct device_d *dev, int num)
if (IS_ERR(res))
return ERR_CAST(res);
- return (void __force __iomem *)res->start;
+ return IOMEM(res->start);
}
EXPORT_SYMBOL(dev_request_mem_region);