wifi: support wifi chip type report

diff --git a/arch/arm/configs/rk30_sdk_defconfig b/arch/arm/configs/rk30_sdk_defconfig
index d25412d4a428db4b20ad5518c67fb11d97fc0a0a..a96a07340f4f83df78e031b9a2e79d7a06f48e5f 100755 (executable)
--- a/arch/arm/configs/rk30_sdk_defconfig
+++ b/arch/arm/configs/rk30_sdk_defconfig
@@ -201,7 +201,6 @@ CONFIG_PHYLIB=y
 # CONFIG_NETDEV_10000 is not set
 CONFIG_WLAN_80211=y
 CONFIG_RKWIFI=y
-CONFIG_BCM4330=y
 CONFIG_USB_USBNET=y
 CONFIG_PPP=y
 CONFIG_PPP_MULTILINK=y

diff --git a/drivers/net/wireless/rkwifi/Kconfig b/drivers/net/wireless/rkwifi/Kconfig
index b8c9825526ce7ac16bab643b0b009d9b705dc58d..5a17bd8773514b82b7893a1e1d8ad33b784b3236 100644 (file)
--- a/drivers/net/wireless/rkwifi/Kconfig
+++ b/drivers/net/wireless/rkwifi/Kconfig
@@ -1,5 +1,5 @@
 config RKWIFI
-       tristate "RK901/RK903/BCM4329/BCM4330 wireless cards support"
+       tristate "RK901/RK903/BCM4330 wireless cards support"
        depends on MMC && WLAN_80211
        select WIRELESS_EXT
        select WEXT_PRIV

diff --git a/drivers/net/wireless/wifi_sys/rkwifi_sys_iface.c b/drivers/net/wireless/wifi_sys/rkwifi_sys_iface.c
index 90fcf8a52032e74bcfba6bf8120572b5a49ca3e7..f9a7a7d5f4202f3629745c50b316571fe3040a83 100644 (file)
--- a/drivers/net/wireless/wifi_sys/rkwifi_sys_iface.c
+++ b/drivers/net/wireless/wifi_sys/rkwifi_sys_iface.c
@@ -22,6 +22,21 @@ static ssize_t wifi_chip_read(struct class *cls, char *_buf)
     count = sprintf(_buf, "%s", "RTL8188");\r
     printk("Current WiFi chip is RTL8188.\n");\r
 #endif\r
+\r
+#ifdef CONFIG_BCM4330\r
+    count = sprintf(_buf, "%s", "BCM4330");\r
+    printk("Current WiFi chip is BCM4330.\n");\r
+#endif\r
+\r
+#ifdef CONFIG_RK901\r
+    count = sprintf(_buf, "%s", "RK901");\r
+    printk("Current WiFi chip is RK901.\n");\r
+#endif\r
+\r
+#ifdef CONFIG_RK903\r
+    count = sprintf(_buf, "%s", "RK903");\r
+    printk("Current WiFi chip is RK903.\n");\r
+#endif\r
     \r
     return count;\r
 }\r