rk29: fix uart3 support

diff --git a/arch/arm/mach-rk29/board-rk29-a22.c b/arch/arm/mach-rk29/board-rk29-a22.c
index 3be1135321866b0408fa7c856604edb4e1171eca..3885ca9219b4637f7ebad6ed54a8d3d3af1f9ce3 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-a22.c
+++ b/arch/arm/mach-rk29/board-rk29-a22.c
@@ -2489,6 +2489,9 @@ static struct platform_device *devices[] __initdata = {
 #ifdef CONFIG_UART2_RK29
        &rk29_device_uart2,
 #endif
+#ifdef CONFIG_UART3_RK29
+       &rk29_device_uart3,
+#endif
 
 #ifdef CONFIG_RK29_PWM_REGULATOR
        &rk29_device_pwm_regulator,

diff --git a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
index f5c5618a1030279d51cfa1cc957dac8232cb9992..d72a6767e93de6cbaec151fd0314b2eb811e5f47 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
+++ b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
@@ -1471,6 +1471,9 @@ static struct platform_device *devices[] __initdata = {
 #ifdef CONFIG_UART2_RK29
        &rk29_device_uart2,
 #endif
+#ifdef CONFIG_UART3_RK29
+       &rk29_device_uart3,
+#endif
 
 #ifdef CONFIG_RK29_PWM_REGULATOR
        &rk29_device_pwm_regulator,

diff --git a/arch/arm/mach-rk29/board-rk29-phonesdk.c b/arch/arm/mach-rk29/board-rk29-phonesdk.c
index cc6056a68bc7546fa3ce272c3b5d46575b145488..8683bf3d1f56cdf04eea12ebc1cb1674d4d001fd 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-phonesdk.c
+++ b/arch/arm/mach-rk29/board-rk29-phonesdk.c
@@ -2485,6 +2485,9 @@ static struct platform_device *devices[] __initdata = {
 #ifdef CONFIG_UART2_RK29
        &rk29_device_uart2,
 #endif
+#ifdef CONFIG_UART3_RK29
+       &rk29_device_uart3,
+#endif
 
 #ifdef CONFIG_RK29_PWM_REGULATOR
        &rk29_device_pwm_regulator,

diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
index 74bb859209aa47d3003216d61b960a1741c69003..6c57cb461bc03049532d67296777d2033c6d4e4b 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@ -1495,6 +1495,9 @@ static struct platform_device *devices[] __initdata = {
 #ifdef CONFIG_UART2_RK29
        &rk29_device_uart2,
 #endif
+#ifdef CONFIG_UART3_RK29
+       &rk29_device_uart3,
+#endif
 
 #ifdef CONFIG_RK29_PWM_REGULATOR
        &rk29_device_pwm_regulator,

diff --git a/arch/arm/mach-rk29/include/mach/rk29_iomap.h b/arch/arm/mach-rk29/include/mach/rk29_iomap.h
index 940bb9736c2972c8ce5053fba4313e4bd367e3b2..f089fcbec7a584cee12d9a8732c83fe6bc9d1afa 100644 (file)
--- a/arch/arm/mach-rk29/include/mach/rk29_iomap.h
+++ b/arch/arm/mach-rk29/include/mach/rk29_iomap.h
@@ -123,7 +123,7 @@
 #define RK29_I2C0_PHYS                 0x2002C000
 #define RK29_I2C0_SIZE                         SZ_16K
 #define RK29_UART0_PHYS                0x20030000
-#define RK29_UART0_SIZE                                SZ_16K
+#define RK29_UART0_SIZE                                SZ_4K
 #define RK29_GPIO0_BASE                                (RK29_ADDR_BASE1+0x34000)
 #define RK29_GPIO0_PHYS                0x20034000
 #define RK29_GPIO0_SIZE                                SZ_16K
@@ -160,10 +160,11 @@
 #define RK29_I2C3_SIZE                         SZ_16K
 #define RK29_UART1_PHYS                0x20060000
 #define RK29_UART1_BASE                (RK29_ADDR_BASE1+0x60000)
-#define RK29_UART1_SIZE                SZ_16K
+#define RK29_UART1_SIZE                SZ_4K
 #define RK29_UART2_PHYS                                0x20064000
-#define RK29_UART2_SIZE                                SZ_16K
+#define RK29_UART2_SIZE                                SZ_4K
 #define RK29_UART3_PHYS                                0x20068000
+#define RK29_UART3_SIZE                                SZ_4K
 #define RK29_TIMER2_SIZE                       SZ_16K
 #define RK29_ADC_PHYS                          0x2006C000
 #define RK29_ADC_SIZE                          SZ_16K