aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500/db8500-regs.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-05-31 16:47:04 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-06-04 05:21:58 -0400
commit080e0435e54298992dfc03dc04ca53cfe3de36ba (patch)
tree4ecb520553e3dc517f6d8412b7321e304f9c938a /arch/arm/mach-ux500/db8500-regs.h
parent19d323412447177208785ba391c0f2288b56b5c8 (diff)
ARM: ux500: avoid warning in ux500_read_asicid
phys_addr_t may be 64 bit, which causes this harmless warning in ux500_read_asicid: arch/arm/mach-ux500/id.c: In function 'ux500_read_asicid': arch/arm/include/asm/io.h:159:19: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define IOMEM(x) ((void __force __iomem *)(x)) ^ arch/arm/mach-ux500/id.c:40:9: note: in expansion of macro 'readl' return readl(IOMEM(UX500_VIRT_ROM + (addr & 0xfff))); We can solve this in a nicer way by making UX500_VIRT_ROM have a proper type to start with and calculating the address using pointer arithmetic. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/db8500-regs.h')
-rw-r--r--arch/arm/mach-ux500/db8500-regs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/db8500-regs.h b/arch/arm/mach-ux500/db8500-regs.h
index 1055c54caf78..27399553c841 100644
--- a/arch/arm/mach-ux500/db8500-regs.h
+++ b/arch/arm/mach-ux500/db8500-regs.h
@@ -183,7 +183,7 @@
183#define U8500_IO_VIRTUAL 0xf0000000 183#define U8500_IO_VIRTUAL 0xf0000000
184#define U8500_IO_PHYSICAL 0xa0000000 184#define U8500_IO_PHYSICAL 0xa0000000
185/* This is where we map in the ROM to check ASIC IDs */ 185/* This is where we map in the ROM to check ASIC IDs */
186#define UX500_VIRT_ROM 0xf0000000 186#define UX500_VIRT_ROM IOMEM(0xf0000000)
187 187
188/* This macro is used in assembly, so no cast */ 188/* This macro is used in assembly, so no cast */
189#define IO_ADDRESS(x) \ 189#define IO_ADDRESS(x) \