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

rk29_phone: 解决先激活蓝牙,再激活wifi时,提示出错的问题，增加对gpio WIFI_RST的控制

Browse Source
This commit is contained in:
wdc
2011-06-10 12:26:53 +08:00
parent 0bf9d0684a
commit 3e84f43c06
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/mach-rk29/board-rk29-a22.c Normal file → Executable file
View File

@@ -2280,8 +2280,8 @@ static int rk29sdk_wifi_bt_gpio_control_init(void)
}
gpio_direction_output(RK29SDK_WIFI_BT_GPIO_POWER_N, GPIO_LOW);
gpio_direction_output(RK29SDK_WIFI_GPIO_RESET_N, GPIO_HIGH);
gpio_direction_output(RK29SDK_BT_GPIO_RESET_N, GPIO_HIGH);
gpio_direction_output(RK29SDK_WIFI_GPIO_RESET_N, GPIO_LOW);
gpio_direction_output(RK29SDK_BT_GPIO_RESET_N, GPIO_LOW);
pr_info("%s: init finished\n",__func__);
@@ -2292,18 +2292,20 @@ static int rk29sdk_wifi_power(int on)
{
pr_info("%s: %d\n", __func__, on);
if (on){
gpio_set_value(RK29SDK_WIFI_BT_GPIO_POWER_N, on);
gpio_set_value(RK29SDK_WIFI_BT_GPIO_POWER_N, GPIO_HIGH);
gpio_set_value(RK29SDK_WIFI_GPIO_RESET_N, GPIO_HIGH);
mdelay(100);
pr_info("wifi turn on power\n");
}else{
if (!rk29sdk_bt_power_state){
gpio_set_value(RK29SDK_WIFI_BT_GPIO_POWER_N, on);
gpio_set_value(RK29SDK_WIFI_BT_GPIO_POWER_N, GPIO_LOW);
mdelay(100);
pr_info("wifi shut off power\n");
}else
{
pr_info("wifi shouldn't shut off power, bt is using it!\n");
}
gpio_set_value(RK29SDK_WIFI_GPIO_RESET_N, GPIO_LOW);
}

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

@@ -2178,8 +2178,8 @@ static int rk29sdk_wifi_bt_gpio_control_init(void)
}
gpio_direction_output(RK29SDK_WIFI_BT_GPIO_POWER_N, GPIO_LOW);
gpio_direction_output(RK29SDK_WIFI_GPIO_RESET_N, GPIO_HIGH);
gpio_direction_output(RK29SDK_BT_GPIO_RESET_N, GPIO_HIGH);
gpio_direction_output(RK29SDK_WIFI_GPIO_RESET_N, GPIO_LOW);
gpio_direction_output(RK29SDK_BT_GPIO_RESET_N, GPIO_LOW);
pr_info("%s: init finished\n",__func__);
@@ -2190,18 +2190,20 @@ static int rk29sdk_wifi_power(int on)
{
pr_info("%s: %d\n", __func__, on);
if (on){
gpio_set_value(RK29SDK_WIFI_BT_GPIO_POWER_N, on);
gpio_set_value(RK29SDK_WIFI_BT_GPIO_POWER_N, GPIO_HIGH);
gpio_set_value(RK29SDK_WIFI_GPIO_RESET_N, GPIO_HIGH);
mdelay(100);
pr_info("wifi turn on power\n");
}else{
if (!rk29sdk_bt_power_state){
gpio_set_value(RK29SDK_WIFI_BT_GPIO_POWER_N, on);
gpio_set_value(RK29SDK_WIFI_BT_GPIO_POWER_N, GPIO_LOW);
mdelay(100);
pr_info("wifi shut off power\n");
}else
{
pr_info("wifi shouldn't shut off power, bt is using it!\n");
}
gpio_set_value(RK29SDK_WIFI_GPIO_RESET_N, GPIO_LOW);
}