diff options
| author | Yao Xiao <xiaoyao@rock-chips.com> | 2018-08-01 09:43:57 +0800 |
|---|---|---|
| committer | Tao Huang <huangtao@rock-chips.com> | 2018-08-03 16:32:24 +0800 |
| commit | 747439a9e6b45abadb5fa8023743cc69c9914f24 (patch) | |
| tree | b5b49a850adc1ffb8307d834682fcff48d58f2a8 /drivers/net/wireless/rockchip_wlan | |
| parent | 16d318c502d17a4c516c42fa9f2af0cba2909d7a (diff) | |
net: rockchip_wlan: rtl8189fs: support gpio to wake up for wowlan
Change-Id: I7500c96d21c07c453e4dd6e81a393c08f48728f7
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
Diffstat (limited to 'drivers/net/wireless/rockchip_wlan')
5 files changed, 10 insertions, 5 deletions
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/Makefile b/drivers/net/wireless/rockchip_wlan/rtl8189fs/Makefile index 8bd53d427a40..4bb099292b19 100644 --- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/Makefile +++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/Makefile @@ -71,8 +71,8 @@ CONFIG_ANTENNA_DIVERSITY = n CONFIG_TDLS = n CONFIG_WIFI_MONITOR = n ######################## Wake On Lan ########################## -CONFIG_WOWLAN = n -CONFIG_GPIO_WAKEUP = n +CONFIG_WOWLAN = y +CONFIG_GPIO_WAKEUP = y CONFIG_WAKEUP_GPIO_IDX = default CONFIG_HIGH_ACTIVE = n CONFIG_PNO_SUPPORT = n diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/hal_com.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/hal_com.c index ff6e59416d51..59a907fbfd96 100644 --- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/hal_com.c +++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/hal/hal_com.c @@ -2039,7 +2039,7 @@ static void rtw_hal_release_rx_dma(_adapter *adapter) rtw_write32(adapter, REG_RXPKT_NUM, (val32 & (~RW_RELEASE_EN))); - DBG_871X("%s, [0x%04x]: 0x%08x\n", + DBG_871X("%s, [0x%04x]: 0x%08lx\n", __func__, REG_RXPKT_NUM, (val32 & (~RW_RELEASE_EN))); } diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/include/autoconf.h b/drivers/net/wireless/rockchip_wlan/rtl8189fs/include/autoconf.h index 44efe4233710..6f4090351274 100644 --- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/include/autoconf.h +++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/include/autoconf.h @@ -224,7 +224,7 @@ /* * Debug Related Config */ -#define CONFIG_DEBUG /* DBG_871X, etc... */ +//#define CONFIG_DEBUG /* DBG_871X, etc... */ #ifdef CONFIG_DEBUG #define DBG 1 // for ODM & BTCOEX debug diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/include/wifi.h b/drivers/net/wireless/rockchip_wlan/rtl8189fs/include/wifi.h index 9d21a5afdbac..0192f8918aac 100644 --- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/include/wifi.h +++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/include/wifi.h @@ -25,7 +25,7 @@ //#error "BIT define occurred earlier elsewhere!\n" #undef BIT #endif -#define BIT(x) (1 << (x)) +#define BIT(x) (1UL << (x)) #define WLAN_ETHHDR_LEN 14 diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/platform/platform_ops.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/platform/platform_ops.c index e9b0191f8bb8..6352cc598b94 100644 --- a/drivers/net/wireless/rockchip_wlan/rtl8189fs/platform/platform_ops.c +++ b/drivers/net/wireless/rockchip_wlan/rtl8189fs/platform/platform_ops.c @@ -18,6 +18,10 @@ *
******************************************************************************/
#ifndef CONFIG_PLATFORM_OPS
+
+#include <linux/rfkill-wlan.h>
+extern unsigned int oob_irq;
+
/*
* Return:
* 0: power on successfully
@@ -27,6 +31,7 @@ int platform_wifi_power_on(void) {
int ret = 0;
+ oob_irq = rockchip_wifi_get_oob_irq();
return ret;
}
|