From: 黄涛 <huangtao@rock-chips.com>
Date: Thu, 23 Oct 2014 09:05:46 +0000 (+0800)
Subject: ARM: rockchip: iomap.h: fix compilation error on arm64
X-Git-Tag: firefly_0821_release~4158^2~598
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7ec033f4ae504898ac70894ce3a5a5dd4b936bfb;p=firefly-linux-kernel-4.4.55.git

ARM: rockchip: iomap.h: fix compilation error on arm64
---

diff --git a/include/linux/rockchip/iomap.h b/include/linux/rockchip/iomap.h
index 31a58d5551ea..f8785fa69803 100755
--- a/include/linux/rockchip/iomap.h
+++ b/include/linux/rockchip/iomap.h
@@ -5,7 +5,11 @@
 #include <asm/io.h>
 #endif
 
+#ifdef IOMEM
 #define RK_IO_ADDRESS(x)                IOMEM(0xFED00000 + x)
+#else
+#define RK_IO_ADDRESS(x)                ((void __force __iomem *)(0xFED00000 + x))
+#endif
 
 #define RK_CRU_VIRT                     RK_IO_ADDRESS(0x00000000)
 #define RK_GRF_VIRT                     RK_IO_ADDRESS(0x00010000)