From: wuhao <wuhao@wuhao@rock-chips.com>
Date: Tue, 6 Nov 2012 08:28:31 +0000 (+0800)
Subject: revert the wifi power control of commit cb6f8a8f312c9ee1420a1b1afeb4b550b958f1ac
X-Git-Tag: firefly_0821_release~8270
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=053587a9797c88787e0f32852cf3f9cb825eb367;p=firefly-linux-kernel-4.4.55.git

revert the wifi power control of commit cb6f8a8f312c9ee1420a1b1afeb4b550b958f1ac
---

diff --git a/drivers/net/wireless/rkusbwifi/wifi_power.c b/drivers/net/wireless/rkusbwifi/wifi_power.c
index 2ebcd4b9b872..a0dd91b7ad5a 100755
--- a/drivers/net/wireless/rkusbwifi/wifi_power.c
+++ b/drivers/net/wireless/rkusbwifi/wifi_power.c
@@ -39,16 +39,11 @@ EXPORT_SYMBOL(init_channel_plan);
  */
 struct wifi_power power_gpio = 
 {
-	#if defined(CONFIG_MACH_RK2926_V86)
-        POWER_USE_GPIO, 0,
-        0, 0, RK2928_PIN0_PD3, GPIO_LOW
-        #else
 	POWER_NOT_USE_GPIO, 0, 0, 0, 0, 0 
 
 	// RBOX
 	//POWER_USE_GPIO, POWER_GPIO_IOMUX, 
 	//GPIO5D6_SDMMC1PWREN_NAME, GPIO5H_GPIO5D6, RK29_PIN5_PD6, GPIO_HIGH 
-        #endif
 };
 
 /*
diff --git a/drivers/net/wireless/rkusbwifi/wifi_power_ops.c b/drivers/net/wireless/rkusbwifi/wifi_power_ops.c
index 12b32eca9491..2c289e92665a 100644
--- a/drivers/net/wireless/rkusbwifi/wifi_power_ops.c
+++ b/drivers/net/wireless/rkusbwifi/wifi_power_ops.c
@@ -77,13 +77,7 @@ int wifi_gpio_operate(struct wifi_power *gpio, int flag)
  */
 int wifi_turn_on_rtl8192c_card(void)
 {
-        #if defined(CONFIG_MACH_RK2926_V86)
-        wifi_gpio_operate(&power_gpio, GPIO_SWITCH_ON);
-        //rk29sdk_wifi_power(1);
-        #else
-        //wifi_gpio_operate(&power_gpio, GPIO_SWITCH_ON);
-        rk29sdk_wifi_power(1);
-        #endif
+	//wifi_gpio_operate(&power_gpio, GPIO_SWITCH_ON);
         rk29sdk_wifi_power(1);
 	if (power_gpio.use_gpio != POWER_NOT_USE_GPIO)
 		msleep(1000);
@@ -102,13 +96,8 @@ int wifi_turn_on_card(int module)
 
 int wifi_turn_off_card(void)
 {
-        #if defined(CONFIG_MACH_RK2926_V86)
-        wifi_gpio_operate(&power_gpio, GPIO_SWITCH_OFF);
-        //rk29sdk_wifi_power(0);
-        #else
- 	//wifi_gpio_operate(&power_gpio, GPIO_SWITCH_OFF);
+	//wifi_gpio_operate(&power_gpio, GPIO_SWITCH_OFF);
         rk29sdk_wifi_power(0);
-        #endif
 	msleep(5);
 
 	wifi_turn_off_callback();