From babfea4e0186321d44d4e54cc7980b5d1054d9c4 Mon Sep 17 00:00:00 2001 From: gwl Date: Mon, 12 Nov 2012 12:44:22 +0800 Subject: [PATCH] add to support rt5370 usb wifi --- arch/arm/mach-rk2928/board-rk2928-sdk-sdmmc.c | 6 +++--- arch/arm/mach-rk2928/board-rk2928-sdk.c | 2 +- drivers/net/wireless/Kconfig | 1 + drivers/net/wireless/Makefile | 1 + drivers/net/wireless/rkusbwifi/Makefile | 1 + drivers/net/wireless/rkusbwifi/rt5370/Kconfig | 8 ++++++++ drivers/net/wireless/wifi_sys/rkwifi_sys_iface.c | 5 +++++ 7 files changed, 20 insertions(+), 4 deletions(-) mode change 100644 => 100755 drivers/net/wireless/Makefile create mode 100755 drivers/net/wireless/rkusbwifi/rt5370/Kconfig mode change 100644 => 100755 drivers/net/wireless/wifi_sys/rkwifi_sys_iface.c diff --git a/arch/arm/mach-rk2928/board-rk2928-sdk-sdmmc.c b/arch/arm/mach-rk2928/board-rk2928-sdk-sdmmc.c index fa7f3ab63718..7cedb18c1a4e 100755 --- a/arch/arm/mach-rk2928/board-rk2928-sdk-sdmmc.c +++ b/arch/arm/mach-rk2928/board-rk2928-sdk-sdmmc.c @@ -246,7 +246,7 @@ static void rk29_sdmmc_set_iomux(int device_id, unsigned int bus_width) #define RK30SDK_WIFI_GPIO_RESET_ENABLE_VALUE GPIO_HIGH #endif -#if defined(CONFIG_RTL8192CU) || defined(CONFIG_RTL8188EU) +#if defined(CONFIG_RTL8192CU) || defined(CONFIG_RTL8188EU) || defined(CONFIG_RT5370) #if defined(CONFIG_MACH_RK2926_V86) #define CONFIG_USB_WIFI_POWER_CONTROLED_BY_GPIO #define RK30SDK_WIFI_GPIO_POWER_N RK2928_PIN0_PD3 @@ -358,7 +358,7 @@ static int rk29sdk_wifi_status_register(void (*callback)(int card_present, void return 0; } -#if defined(CONFIG_RTL8192CU) || defined(CONFIG_RTL8188EU) +#if defined(CONFIG_RTL8192CU) || defined(CONFIG_RTL8188EU) || defined(CONFIG_RT5370) static int __init rk29sdk_wifi_bt_gpio_control_init(void) { return 0; @@ -418,7 +418,7 @@ static int __init rk29sdk_wifi_bt_gpio_control_init(void) } #endif -#if defined(CONFIG_RTL8192CU) || defined(CONFIG_RTL8188EU) +#if defined(CONFIG_RTL8192CU) || defined(CONFIG_RTL8188EU) || defined(CONFIG_RT5370) static int usbwifi_power_status = 1; int rk29sdk_wifi_power(int on) { diff --git a/arch/arm/mach-rk2928/board-rk2928-sdk.c b/arch/arm/mach-rk2928/board-rk2928-sdk.c index c6c70d8f7609..f530c30195bd 100755 --- a/arch/arm/mach-rk2928/board-rk2928-sdk.c +++ b/arch/arm/mach-rk2928/board-rk2928-sdk.c @@ -479,7 +479,7 @@ struct platform_device pwm_regulator_device[1] = { /*********************************************************** * usb wifi ************************************************************/ -#if defined(CONFIG_RTL8192CU) || defined(CONFIG_RTL8188EU) +#if defined(CONFIG_RTL8192CU) || defined(CONFIG_RTL8188EU) || defined(CONFIG_RT5370) static void rkusb_wifi_power(int on) { struct regulator *ldo = NULL; diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 2acbb3f3e75b..ab6e31dbb84a 100755 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -89,6 +89,7 @@ choice source "drivers/net/wireless/rkusbwifi/rtl8192cu/Kconfig" source "drivers/net/wireless/rkusbwifi/rtl8188eu/Kconfig" +source "drivers/net/wireless/rkusbwifi/rt5370/Kconfig" source "drivers/net/wireless/ar6003/Kconfig" source "drivers/net/wireless/rkwifi/Kconfig" endchoice diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile old mode 100644 new mode 100755 index 08143cc16a8b..86805547561c --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -7,6 +7,7 @@ obj-$(CONFIG_MV8686) += mv8686/ obj-$(CONFIG_BCM4319) += bcm4319/ obj-$(CONFIG_RTL8192CU) += rkusbwifi/ obj-$(CONFIG_RTL8188EU) += rkusbwifi/ +obj-$(CONFIG_RT5370) += rkusbwifi/ obj-$(CONFIG_AR6003) += ar6003/ obj-$(CONFIG_RKWIFI) += rkwifi/ obj-$(CONFIG_RDA5990) += rda5990/ diff --git a/drivers/net/wireless/rkusbwifi/Makefile b/drivers/net/wireless/rkusbwifi/Makefile index ae3d3fded1ae..4f2dd5163ddb 100755 --- a/drivers/net/wireless/rkusbwifi/Makefile +++ b/drivers/net/wireless/rkusbwifi/Makefile @@ -7,6 +7,7 @@ rkcfg-y += $(rk_cfg) obj-$(CONFIG_RTL8188EU) += rkcfg.o obj-$(CONFIG_RTL8192CU) += rkcfg.o +obj-$(CONFIG_RT5370) += rkcfg.o .PHONY: clean diff --git a/drivers/net/wireless/rkusbwifi/rt5370/Kconfig b/drivers/net/wireless/rkusbwifi/rt5370/Kconfig new file mode 100755 index 000000000000..83220bd99477 --- /dev/null +++ b/drivers/net/wireless/rkusbwifi/rt5370/Kconfig @@ -0,0 +1,8 @@ +config RT5370 + tristate "Mediatek RT5370 USB WiFi Support" + select WIRELESS_EXT + select WEXT_PRIV + select IEEE80211 + ---help--- + Help message of RT5370 + diff --git a/drivers/net/wireless/wifi_sys/rkwifi_sys_iface.c b/drivers/net/wireless/wifi_sys/rkwifi_sys_iface.c old mode 100644 new mode 100755 index 593d078d4550..2e2ea778db58 --- a/drivers/net/wireless/wifi_sys/rkwifi_sys_iface.c +++ b/drivers/net/wireless/wifi_sys/rkwifi_sys_iface.c @@ -43,6 +43,11 @@ static ssize_t wifi_chip_read(struct class *cls, char *_buf) printk("Current WiFi chip is RK903.\n"); #endif +#ifdef CONFIG_RT5370 + count = sprintf(_buf, "%s", "RT5370"); + printk("Current WiFi chip is RT5370.\n"); +#endif + return count; } -- 2.34.1