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

net: rfkill-bt: auto compatible for uart rts control for all uart bt chip

Browse Source 
Change-Id: I9b4d6614160285754ee86c427e8918296b92ddbd
Signed-off-by: huweiguo <hwg@rock-chips.com>
This commit is contained in:
huweiguo
2016-03-14 09:07:44 +08:00
committed by Gerrit Code Review
parent 3cbba607a8
commit f99458ca37
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/rfkill/rfkill-bt.c
View File

@@ -266,10 +266,8 @@ static int rfkill_rk_set_power(void *data, bool blocked)
struct rfkill_rk_data *rfkill = data;
struct rfkill_rk_gpio *poweron = &rfkill->pdata->poweron_gpio;
struct rfkill_rk_gpio *reset = &rfkill->pdata->reset_gpio;
#if defined(CONFIG_AP6210) || defined(CONFIG_AP6335)
struct rfkill_rk_gpio* rts = &rfkill->pdata->rts_gpio;
struct pinctrl *pinctrl = rfkill->pdata->pinctrl;
#endif
int power = 0, vref_ctrl_enable = 0;
bool toggle = false;
@@ -305,7 +303,7 @@ static int rfkill_rk_set_power(void *data, bool blocked)
msleep(20);
gpio_direction_output(reset->io, reset->enable);
}
#if defined(CONFIG_AP6210) || defined(CONFIG_AP6335)
if (pinctrl != NULL && gpio_is_valid(rts->io))
{
pinctrl_select_state(pinctrl, rts->gpio_state);
@@ -316,7 +314,7 @@ static int rfkill_rk_set_power(void *data, bool blocked)
gpio_direction_output(rts->io, !rts->enable);
pinctrl_select_state(pinctrl, rts->default_state);
}
#endif
bt_power_state = 1;
LOG("bt turn on power\n");
} else {