Merge tag 'lsk-v3.10-android-15.02'

[firefly-linux-kernel-4.4.55.git] / include / linux / rockchip / iomap.h

diff --git a/include/linux/rockchip/iomap.h b/include/linux/rockchip/iomap.h
index 1adbcb2941874a4131f777ed2377f3473969e9dd..f8785fa69803f2217bb9521d0400d9d9c8a60fc6 100755 (executable)
--- 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)
@@ -17,6 +21,7 @@
 #define RK_DEBUG_UART_VIRT              RK_IO_ADDRESS(0x00060000)
 #define RK_CPU_AXI_BUS_VIRT             RK_IO_ADDRESS(0x00070000)
 #define RK_TIMER_VIRT                   RK_IO_ADDRESS(0x00080000)
+#define RK_PWM_VIRT                    RK_IO_ADDRESS(0x00088000)
 #define RK_GIC_VIRT                     RK_IO_ADDRESS(0x00090000)
 #define RK_BOOTRAM_VIRT                 RK_IO_ADDRESS(0x000a0000)
 #define RK_DDR_VIRT                     RK_IO_ADDRESS(0x000d0000)
@@ -143,6 +148,8 @@
 #define RK3036_GPIO_SIZE               SZ_4K
 #define RK3036_EFUSE_PHYS              0x20090000
 #define RK3036_EFUSE_SIZE              SZ_4K
+#define RK3036_PWM_PHYS                0x20050000
+#define RK3036_PWM_SIZE                SZ_16K
 
 #define RK312X_IMEM_PHYS                RK3036_IMEM_PHYS
 #define RK312X_IMEM_SIZE                RK3036_IMEM_SIZE
@@ -175,5 +182,9 @@
 #define RK312X_GPIO_SIZE                RK3036_GPIO_SIZE
 #define RK312X_EFUSE_PHYS               RK3036_EFUSE_PHYS
 #define RK312X_EFUSE_SIZE               RK3036_EFUSE_SIZE
+#define RK312X_PMU_PHYS                        0x100a0000
+#define RK312X_PMU_SIZE                        SZ_64K
+#define RK312X_PWM_PHYS                        0x20050000
+#define RK312X_PWM_SIZE                        SZ_16K
 
 #endif