From d5674ddd0ecc83179e431887ca4e00e2eebdc3cd Mon Sep 17 00:00:00 2001 From: wdc Date: Mon, 11 Jul 2011 17:10:21 +0800 Subject: [PATCH] bluetooth: set wake_up_host gpio --- arch/arm/mach-rk29/board-rk29-a22-rfkill.c | 13 +++++++------ arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c | 9 +++++---- 2 files changed, 12 insertions(+), 10 deletions(-) mode change 100644 => 100755 arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c diff --git a/arch/arm/mach-rk29/board-rk29-a22-rfkill.c b/arch/arm/mach-rk29/board-rk29-a22-rfkill.c index 14367abd92fe..71b3119b0cfc 100755 --- a/arch/arm/mach-rk29/board-rk29-a22-rfkill.c +++ b/arch/arm/mach-rk29/board-rk29-a22-rfkill.c @@ -24,14 +24,14 @@ #include #include #include - +#include #if 0 #define DBG(x...) printk(KERN_INFO x) #else #define DBG(x...) #endif -#define BT_WAKE_HOST_SUPPORT 0 +#define BT_WAKE_HOST_SUPPORT 1 struct bt_ctrl { @@ -47,8 +47,8 @@ struct bt_ctrl #define IOMUX_BT_GPIO_POWER rk29_mux_api_set(GPIO5D6_SDMMC1PWREN_NAME, GPIO5H_GPIO5D6); #define BT_GPIO_RESET RK29_PIN6_PC7 #define BT_GPIO_WAKE_UP RK29_PIN6_PD0 -#define BT_GPIO_WAKE_UP_HOST //RK2818_PIN_PA7 -#define IOMUX_BT_GPIO_WAKE_UP_HOST() //rk2818_mux_api_set(GPIOA7_FLASHCS3_SEL_NAME,0); +#define BT_GPIO_WAKE_UP_HOST RK29_PIN4_PD4 +#define IOMUX_BT_GPIO_WAKE_UP_HOST() rk29_mux_api_set(GPIO4D4_CPUTRACECLK_NAME,GPIO4H_GPIO4D4); #define BT_WAKE_LOCK_TIMEOUT 10 //s @@ -68,6 +68,7 @@ void btWakeupHostLock(void) { if(gBtCtrl.b_HostWake == false){ DBG("*************************Lock\n"); + rk28_send_wakeup_key(); wake_lock(&(gBtCtrl.bt_wakelock)); gBtCtrl.b_HostWake = true; } @@ -138,9 +139,9 @@ static int bcm4329_set_block(void *data, bool blocked) if (false == blocked) { gpio_set_value(BT_GPIO_POWER, GPIO_HIGH); /* bt power on */ gpio_set_value(BT_GPIO_RESET, GPIO_LOW); - mdelay(20); + mdelay(200); gpio_set_value(BT_GPIO_RESET, GPIO_HIGH); /* bt reset deactive*/ - mdelay(20); + mdelay(200); #if BT_WAKE_HOST_SUPPORT btWakeupHostLock(); diff --git a/arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c b/arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c old mode 100644 new mode 100755 index db39a9dad654..71b3119b0cfc --- a/arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c +++ b/arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c @@ -24,14 +24,14 @@ #include #include #include - +#include #if 0 #define DBG(x...) printk(KERN_INFO x) #else #define DBG(x...) #endif -#define BT_WAKE_HOST_SUPPORT 0 +#define BT_WAKE_HOST_SUPPORT 1 struct bt_ctrl { @@ -47,8 +47,8 @@ struct bt_ctrl #define IOMUX_BT_GPIO_POWER rk29_mux_api_set(GPIO5D6_SDMMC1PWREN_NAME, GPIO5H_GPIO5D6); #define BT_GPIO_RESET RK29_PIN6_PC7 #define BT_GPIO_WAKE_UP RK29_PIN6_PD0 -#define BT_GPIO_WAKE_UP_HOST //RK2818_PIN_PA7 -#define IOMUX_BT_GPIO_WAKE_UP_HOST() //rk2818_mux_api_set(GPIOA7_FLASHCS3_SEL_NAME,0); +#define BT_GPIO_WAKE_UP_HOST RK29_PIN4_PD4 +#define IOMUX_BT_GPIO_WAKE_UP_HOST() rk29_mux_api_set(GPIO4D4_CPUTRACECLK_NAME,GPIO4H_GPIO4D4); #define BT_WAKE_LOCK_TIMEOUT 10 //s @@ -68,6 +68,7 @@ void btWakeupHostLock(void) { if(gBtCtrl.b_HostWake == false){ DBG("*************************Lock\n"); + rk28_send_wakeup_key(); wake_lock(&(gBtCtrl.bt_wakelock)); gBtCtrl.b_HostWake = true; } -- 2.34.1