shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 21:07:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "bluetooth: iomux uart2_rts to gpio"

Browse Source 
This reverts commit 8b1e5c75a5482a262d63f78bc338fee2a96da7f5.
This commit is contained in:
wdc
2011-07-13 09:34:57 +08:00
parent 3f20262a94
commit 8db2e9e6fa
2 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/mach-rk29/board-rk29-a22-rfkill.c
View File

@@ -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

12
arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c
View File

@@ -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