From: root <root@lw.(none)>
Date: Wed, 14 Sep 2011 03:06:04 +0000 (+0800)
Subject: rk29_phone:disable pull down resistor of uart1
X-Git-Tag: firefly_0821_release~9767^2~26^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7f4b4c1f9e06147927bd22836c4fecbfa944f605;p=firefly-linux-kernel-4.4.55.git

rk29_phone:disable pull down resistor of uart1
---

diff --git a/arch/arm/mach-rk29/board-rk29-a22.c b/arch/arm/mach-rk29/board-rk29-a22.c
old mode 100644
new mode 100755
index 0da7ee9da791..599ce5865cc1
--- a/arch/arm/mach-rk29/board-rk29-a22.c
+++ b/arch/arm/mach-rk29/board-rk29-a22.c
@@ -2487,7 +2487,25 @@ struct platform_device rk29_device_vibrator ={
 
 static void __init rk29_board_iomux_init(void)
 {
-		int err;
+	int err;
+
+#ifdef CONFIG_UART1_RK29
+	//disable uart1 pull down
+	rk29_mux_api_set(GPIO2A5_UART1SOUT_NAME, GPIO2L_GPIO2A5); 			
+	rk29_mux_api_set(GPIO2A4_UART1SIN_NAME, GPIO2L_GPIO2A4); 		
+
+	gpio_request(RK29_PIN2_PA5, NULL);
+	gpio_request(RK29_PIN2_PA4, NULL);
+
+	gpio_pull_updown(RK29_PIN2_PA5, PullDisable);
+	gpio_pull_updown(RK29_PIN2_PA4, PullDisable);
+
+	rk29_mux_api_set(GPIO2A5_UART1SOUT_NAME, GPIO2L_UART1_SOUT); 			
+	rk29_mux_api_set(GPIO2A4_UART1SIN_NAME, GPIO2L_UART1_SIN); 
+
+	gpio_free(RK29_PIN2_PA5);
+	gpio_free(RK29_PIN2_PA4);
+#endif
 
 	#if CONFIG_ANDROID_TIMED_GPIO
 	rk29_mux_api_set(GPIO1B5_PWM0_NAME, GPIO1L_GPIO1B5);//for timed gpio
diff --git a/arch/arm/mach-rk29/board-rk29-phonesdk.c b/arch/arm/mach-rk29/board-rk29-phonesdk.c
index 6e2b66b6d183..47e0c7603bcb 100755
--- a/arch/arm/mach-rk29/board-rk29-phonesdk.c
+++ b/arch/arm/mach-rk29/board-rk29-phonesdk.c
@@ -2454,6 +2454,24 @@ static struct platform_device gpio_wave_device = {
 static void __init rk29_board_iomux_init(void)
 {
 	int err;
+
+#ifdef CONFIG_UART1_RK29
+	//disable uart1 pull down
+	rk29_mux_api_set(GPIO2A5_UART1SOUT_NAME, GPIO2L_GPIO2A5);			
+	rk29_mux_api_set(GPIO2A4_UART1SIN_NAME, GPIO2L_GPIO2A4);		
+
+	gpio_request(RK29_PIN2_PA5, NULL);
+	gpio_request(RK29_PIN2_PA4, NULL);
+
+	gpio_pull_updown(RK29_PIN2_PA5, PullDisable);
+	gpio_pull_updown(RK29_PIN2_PA4, PullDisable);
+
+	rk29_mux_api_set(GPIO2A5_UART1SOUT_NAME, GPIO2L_UART1_SOUT);			
+	rk29_mux_api_set(GPIO2A4_UART1SIN_NAME, GPIO2L_UART1_SIN); 
+
+	gpio_free(RK29_PIN2_PA5);
+	gpio_free(RK29_PIN2_PA4);
+#endif
 	#ifdef CONFIG_RK29_PWM_REGULATOR
 	rk29_mux_api_set(REGULATOR_PWM_MUX_NAME,REGULATOR_PWM_MUX_MODE);
 	#endif