From 3ef5263c29d9a93b814f8cb737a6be468a72166b Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Wed, 13 Apr 2011 12:02:53 +0800 Subject: [PATCH] rk29: fix uart3 support --- arch/arm/mach-rk29/board-rk29-a22.c | 3 +++ arch/arm/mach-rk29/board-rk29-ddr3sdk.c | 3 +++ arch/arm/mach-rk29/board-rk29-phonesdk.c | 3 +++ arch/arm/mach-rk29/board-rk29sdk.c | 3 +++ arch/arm/mach-rk29/include/mach/rk29_iomap.h | 7 ++++--- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-rk29/board-rk29-a22.c b/arch/arm/mach-rk29/board-rk29-a22.c index 3be113532186..3885ca9219b4 100755 --- 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 f5c5618a1030..d72a6767e93d 100755 --- 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 cc6056a68bc7..8683bf3d1f56 100755 --- 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 74bb859209aa..6c57cb461bc0 100755 --- 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 940bb9736c29..f089fcbec7a5 100644 --- 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 -- 2.34.1