Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-rk30 / include / mach / io.h

diff --git a/arch/arm/mach-rk30/include/mach/io.h b/arch/arm/mach-rk30/include/mach/io.h
index 99cbdf4b13ad7d2f0639aef3c756bd7bf26fa00c..a16be19cd662faa99f35844437500fda8cef5394 100755 (executable)
--- a/arch/arm/mach-rk30/include/mach/io.h
+++ b/arch/arm/mach-rk30/include/mach/io.h
@@ -40,10 +40,8 @@
 #define RK30_VCODEC_SIZE        SZ_16K
 #define RK30_CIF0_PHYS          0x10108000
 #define RK30_CIF0_SIZE          SZ_8K
-#ifdef CONFIG_ARCH_RK30
 #define RK30_CIF1_PHYS          0x1010a000
 #define RK30_CIF1_SIZE          SZ_8K
-#endif
 #define RK30_LCDC0_PHYS         0x1010c000
 #define RK30_LCDC0_SIZE         SZ_8K
 #define RK30_LCDC1_PHYS         0x1010e000
@@ -52,18 +50,14 @@
 #define RK30_IPP_SIZE           SZ_16K
 #define RK30_RGA_PHYS           0x10114000
 #define RK30_RGA_SIZE           SZ_8K
-#if defined(CONFIG_ARCH_RK30) || defined(CONFIG_ARCH_RK31)
 #define RK30_HDMI_PHYS          0x10116000
 #define RK30_HDMI_SIZE          SZ_8K
 #define RK30_I2S0_8CH_PHYS      0x10118000
 #define RK30_I2S0_8CH_SIZE      SZ_8K
-#endif
 #define RK30_I2S1_2CH_PHYS      0x1011a000
 #define RK30_I2S1_2CH_SIZE      SZ_8K
-#ifdef CONFIG_ARCH_RK30
 #define RK30_I2S2_2CH_PHYS      0x1011c000
 #define RK30_I2S2_2CH_SIZE      SZ_8K
-#endif
 #define RK30_SPDIF_PHYS         0x1011e000
 #define RK30_SPDIF_SIZE         SZ_8K
 
@@ -143,11 +137,9 @@
 #define RK30_GRF_PHYS           0x20008000
 #define RK30_GRF_BASE           RK30_IO_TO_VIRT1(RK30_GRF_PHYS)
 #define RK30_GRF_SIZE           SZ_8K
-#ifdef CONFIG_ARCH_RK30
 #define RK30_GPIO6_PHYS         0x2000a000
 #define RK30_GPIO6_BASE         RK30_IO_TO_VIRT1(RK30_GPIO6_PHYS)
 #define RK30_GPIO6_SIZE         SZ_8K
-#endif
 
 #define RK30_TIMER2_PHYS        0x2000e000
 #define RK30_TIMER2_BASE        RK30_IO_TO_VIRT1(RK30_TIMER2_PHYS)
@@ -167,6 +159,7 @@
 #define RK30_I2C0_PHYS          0x2002c000
 #define RK30_I2C0_SIZE          SZ_8K
 #define RK30_I2C1_PHYS          0x2002e000
+#define RK30_I2C1_BASE         RK30_IO_TO_VIRT1(RK30_I2C1_PHYS)
 #define RK30_I2C1_SIZE          SZ_8K
 #define RK30_PWM01_PHYS         0x20030000
 #define RK30_PWM01_BASE         RK30_IO_TO_VIRT1(RK30_PWM01_PHYS)
@@ -205,10 +198,8 @@
 #define RK30_I2C3_SIZE          SZ_16K
 #define RK30_I2C4_PHYS          0x2005c000
 #define RK30_I2C4_SIZE          SZ_16K
-#ifdef CONFIG_ARCH_RK30
 #define RK30_TSADC_PHYS         0x20060000
 #define RK30_TSADC_SIZE         SZ_16K
-#endif
 #define RK30_UART2_PHYS         0x20064000
 #define RK30_UART2_BASE         RK30_IO_TO_VIRT1(RK30_UART2_PHYS)
 #define RK30_UART2_SIZE         SZ_16K
@@ -228,18 +219,14 @@
 #define RK30_GPIO3_PHYS         0x20080000
 #define RK30_GPIO3_BASE         RK30_IO_TO_VIRT1(RK30_GPIO3_PHYS)
 #define RK30_GPIO3_SIZE         SZ_16K
-#ifdef CONFIG_ARCH_RK30
 #define RK30_GPIO4_PHYS         0x20084000
 #define RK30_GPIO4_BASE         RK30_IO_TO_VIRT1(RK30_GPIO4_PHYS)
 #define RK30_GPIO4_SIZE         SZ_16K
-#endif
 
-#ifdef CONFIG_ARCH_RK31
 #define RK31_GPS_PHYS           0x10230000
 #define RK31_GPS_SIZE           SZ_64K
 #define RK31_HSIC_PHYS          0x10240000
 #define RK31_HSIC_SIZE          SZ_256K
-#endif
 
 #if CONFIG_RK_DEBUG_UART == 0
 #define DEBUG_UART_PHYS         RK30_UART0_PHYS