From 3e84f43c06491f17951dd8eaf2b4cf1a459aeb09 Mon Sep 17 00:00:00 2001 From: wdc Date: Fri, 10 Jun 2011 12:26:53 +0800 Subject: [PATCH] =?utf8?q?rk29=5Fphone:=20=E8=A7=A3=E5=86=B3=E5=85=88?= =?utf8?q?=E6=BF=80=E6=B4=BB=E8=93=9D=E7=89=99,=E5=86=8D=E6=BF=80=E6=B4=BB?= =?utf8?q?wifi=E6=97=B6,=E6=8F=90=E7=A4=BA=E5=87=BA=E9=94=99=E7=9A=84?= =?utf8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AF=B9gpio=20WIF?= =?utf8?q?I=5FRST=E7=9A=84=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- arch/arm/mach-rk29/board-rk29-a22.c | 10 ++++++---- arch/arm/mach-rk29/board-rk29-phonesdk.c | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) mode change 100644 => 100755 arch/arm/mach-rk29/board-rk29-a22.c diff --git a/arch/arm/mach-rk29/board-rk29-a22.c b/arch/arm/mach-rk29/board-rk29-a22.c old mode 100644 new mode 100755 index d46125925c36..47800e6f62db --- a/arch/arm/mach-rk29/board-rk29-a22.c +++ b/arch/arm/mach-rk29/board-rk29-a22.c @@ -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); } diff --git a/arch/arm/mach-rk29/board-rk29-phonesdk.c b/arch/arm/mach-rk29/board-rk29-phonesdk.c index ff96ccb625ea..fc8f4c76a46a 100755 --- a/arch/arm/mach-rk29/board-rk29-phonesdk.c +++ b/arch/arm/mach-rk29/board-rk29-phonesdk.c @@ -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); } -- 2.34.1