From: wdc <wdc@rock-chips.com>
Date: Wed, 13 Jul 2011 01:34:57 +0000 (+0800)
Subject: Revert "bluetooth: iomux uart2_rts to gpio"
X-Git-Tag: firefly_0821_release~10136^2~11
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8db2e9e6faefaf2cace6648ed64ab65b146eaef9;p=firefly-linux-kernel-4.4.55.git

Revert "bluetooth: iomux uart2_rts to gpio"

This reverts commit 8b1e5c75a5482a262d63f78bc338fee2a96da7f5.
---

diff --git a/arch/arm/mach-rk29/board-rk29-a22-rfkill.c b/arch/arm/mach-rk29/board-rk29-a22-rfkill.c
index 2f8b2396bbae..71b3119b0cfc 100755
--- a/arch/arm/mach-rk29/board-rk29-a22-rfkill.c
+++ b/arch/arm/mach-rk29/board-rk29-a22-rfkill.c
@@ -25,8 +25,7 @@
 #include <linux/wakelock.h>
 #include <linux/timer.h>
 #include <mach/board.h>
-
-#if 1
+#if 0
 #define DBG(x...)   printk(KERN_INFO x)
 #else
 #define DBG(x...)
@@ -94,11 +93,6 @@ static void timer_hostSleep(unsigned long arg)
 #ifdef CONFIG_PM
 static int bcm4329_rfkill_suspend(struct platform_device *pdev, pm_message_t state)
 {   
-	rk29_mux_api_set(GPIO2A7_UART2RTSN_NAME, GPIO2L_GPIO2A7);
-	gpio_request(RK29_PIN2_PA7, "uart2_rts");
-	gpio_direction_output(RK29_PIN2_PA7, 0);
-	gpio_set_value(RK29_PIN2_PA7, GPIO_HIGH);
-			
     DBG("%s\n",__FUNCTION__);  	
     return 0;
 }
@@ -108,10 +102,6 @@ static int bcm4329_rfkill_resume(struct platform_device *pdev)
     DBG("%s\n",__FUNCTION__);     
     btWakeupHostLock();
     resetBtHostSleepTimer();
-
-	gpio_set_value(RK29_PIN2_PA7, GPIO_LOW);
-	rk29_mux_api_set(GPIO2A7_UART2RTSN_NAME, GPIO2L_UART2_RTS_N);
-	
     return 0;
 }
 #else
diff --git a/arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c b/arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c
index 2f8b2396bbae..71b3119b0cfc 100755
--- a/arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c
+++ b/arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c
@@ -25,8 +25,7 @@
 #include <linux/wakelock.h>
 #include <linux/timer.h>
 #include <mach/board.h>
-
-#if 1
+#if 0
 #define DBG(x...)   printk(KERN_INFO x)
 #else
 #define DBG(x...)
@@ -94,11 +93,6 @@ static void timer_hostSleep(unsigned long arg)
 #ifdef CONFIG_PM
 static int bcm4329_rfkill_suspend(struct platform_device *pdev, pm_message_t state)
 {   
-	rk29_mux_api_set(GPIO2A7_UART2RTSN_NAME, GPIO2L_GPIO2A7);
-	gpio_request(RK29_PIN2_PA7, "uart2_rts");
-	gpio_direction_output(RK29_PIN2_PA7, 0);
-	gpio_set_value(RK29_PIN2_PA7, GPIO_HIGH);
-			
     DBG("%s\n",__FUNCTION__);  	
     return 0;
 }
@@ -108,10 +102,6 @@ static int bcm4329_rfkill_resume(struct platform_device *pdev)
     DBG("%s\n",__FUNCTION__);     
     btWakeupHostLock();
     resetBtHostSleepTimer();
-
-	gpio_set_value(RK29_PIN2_PA7, GPIO_LOW);
-	rk29_mux_api_set(GPIO2A7_UART2RTSN_NAME, GPIO2L_UART2_RTS_N);
-	
     return 0;
 }
 #else