ath6kl: enable USB support

Now two modules are built, ath6kl_sdio.ko and ath6kl_usb.ko. But the USB
module isn't fully functional yet as HTC layer is missing support and
that's why it's marked as experimental for now.

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

drivers/net/wireless/ath/ath6kl/Kconfig

@@ -1,12 +1,29 @@
 config ATH6KL
-	tristate "Atheros ath6kl support"
+	tristate "Atheros mobile chipsets support"
+
+config ATH6KL_SDIO
+	tristate "Atheros ath6kl SDIO support"
+	depends on ATH6KL
 	depends on MMC
 	depends on CFG80211
 	---help---
 	  This module adds support for wireless adapters based on
-	  Atheros AR6003 chipset running over SDIO. If you choose to
+	  Atheros AR6003 and AR6004 chipsets running over SDIO. If you
-	  build it as a module, it will be called ath6kl. Pls note
+	  choose to build it as a module, it will be called ath6kl_sdio.
-	  that AR6002 and AR6001 are not supported by this driver.
+	  Please note that AR6002 and AR6001 are not supported by this
+	  driver.
+
+config ATH6KL_USB
+	tristate "Atheros ath6kl USB support"
+	depends on ATH6KL
+	depends on USB
+	depends on CFG80211
+	depends on EXPERIMENTAL
+	---help---
+	  This module adds support for wireless adapters based on
+	  Atheros AR6004 chipset running over USB. This is still under
+	  implementation and it isn't functional. If you choose to
+	  build it as a module, it will be called ath6kl_usb.
 
 config ATH6KL_DEBUG
 	bool "Atheros ath6kl debugging"

drivers/net/wireless/ath/ath6kl/Makefile

@@ -21,17 +21,30 @@
 # Author(s): ="Atheros"
 #------------------------------------------------------------------------------
 
-obj-$(CONFIG_ATH6KL) := ath6kl.o
+obj-$(CONFIG_ATH6KL_SDIO) := ath6kl_sdio.o
-ath6kl-y += debug.o
+ath6kl_sdio-y += debug.o
-ath6kl-y += hif.o
+ath6kl_sdio-y += hif.o
-ath6kl-y += htc.o
+ath6kl_sdio-y += htc.o
-ath6kl-y += bmi.o
+ath6kl_sdio-y += bmi.o
-ath6kl-y += cfg80211.o
+ath6kl_sdio-y += cfg80211.o
-ath6kl-y += init.o
+ath6kl_sdio-y += init.o
-ath6kl-y += main.o
+ath6kl_sdio-y += main.o
-ath6kl-y += txrx.o
+ath6kl_sdio-y += txrx.o
-ath6kl-y += wmi.o
+ath6kl_sdio-y += wmi.o
-ath6kl-y += sdio.o
+ath6kl_sdio-y += sdio.o
-ath6kl-$(CONFIG_NL80211_TESTMODE) += testmode.o
+ath6kl_sdio-$(CONFIG_NL80211_TESTMODE) += testmode.o
+
+obj-$(CONFIG_ATH6KL_USB) += ath6kl_usb.o
+ath6kl_usb-y += debug.o
+ath6kl_usb-y += hif.o
+ath6kl_usb-y += htc.o
+ath6kl_usb-y += bmi.o
+ath6kl_usb-y += cfg80211.o
+ath6kl_usb-y += init.o
+ath6kl_usb-y += main.o
+ath6kl_usb-y += txrx.o
+ath6kl_usb-y += wmi.o
+ath6kl_usb-y += usb.o
+ath6kl_usb-$(CONFIG_NL80211_TESTMODE) += testmode.o
 
 ccflags-y += -D__CHECK_ENDIAN__

drivers/net/wireless/ath/ath6kl/sdio.c

@@ -1298,7 +1298,7 @@ static const struct sdio_device_id ath6kl_sdio_devices[] = {
 MODULE_DEVICE_TABLE(sdio, ath6kl_sdio_devices);
 
 static struct sdio_driver ath6kl_sdio_driver = {
-	.name = "ath6kl",
+	.name = "ath6kl_sdio",
 	.id_table = ath6kl_sdio_devices,
 	.probe = ath6kl_sdio_probe,
 	.remove = ath6kl_sdio_remove,