net: rfkill-bt: auto compatible for uart rts control for all uart bt chip
authorhuweiguo <hwg@rock-chips.com>
Mon, 14 Mar 2016 01:07:44 +0000 (09:07 +0800)
committerGerrit Code Review <gerrit@rock-chips.com>
Tue, 15 Mar 2016 11:38:01 +0000 (19:38 +0800)
Change-Id: I9b4d6614160285754ee86c427e8918296b92ddbd
Signed-off-by: huweiguo <hwg@rock-chips.com>
net/rfkill/rfkill-bt.c

index c7da89ccb54b43120abfe5c954d2231926194f2f..11e182882365f342c880bb8e2ee5e5c407f6ea3f 100644 (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 {