wilc1000: compile single driver for each bus type

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>

Author: ajaykathat

drivers/net/wireless/microchip/Makefile

@@ -1,2 +1,2 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_WILC1000)		+= wilc1000/
+obj-$(CONFIG_WILC)		+= wilc1000/

drivers/net/wireless/microchip/wilc1000/Kconfig

@@ -1,48 +1,47 @@
 # SPDX-License-Identifier: GPL-2.0
-config WILC1000
+config WILC
 	tristate
-	help
-	  Add support for the Atmel WILC1000 802.11 b/g/n SoC.
-	  This provides Wi-FI over an SDIO or SPI interface, and
-	  is usually found in IoT devices.
-
-	  This module only support IEEE 802.11n WiFi.
 
-config WILC1000_SDIO
-	tristate "Atmel WILC1000 SDIO (WiFi only)"
+config WILC_SDIO
+	tristate "WILC SDIO"
 	depends on CFG80211 && INET && MMC
-	select WILC1000
+	select WILC
+	select PWRSEQ_WILC
 	help
 	  This module adds support for the SDIO interface of adapters using
-	  WILC1000 chipset. The Atmel WILC1000 SDIO is a full speed interface.
+	  WILC1000 & WILC3000 chipset. The Atmel WILC1000 SDIO is a full speed interface.
 	  It meets SDIO card specification version 2.0. The interface supports
 	  the 1-bit/4-bit SD transfer mode at the clock range of 0-50 MHz.
 	  The host can use this interface to read and write from any register
 	  within the chip as well as configure the WILC1000 for data DMA.
 	  To use this interface, pin9 (SDIO_SPI_CFG) must be grounded. Select
 	  this if your platform is using the SDIO bus.
+	  WILC3000 additionally supports BT 4.0 and BLE modes.
 
-config WILC1000_SPI
-	tristate "Atmel WILC1000 SPI (WiFi only)"
+config WILC_SPI
+	tristate "WILC SPI"
 	depends on CFG80211 && INET && SPI
-	select WILC1000
+	select WILC
+	select PWRSEQ_WILC
 	select CRC7
 	select CRC_ITU_T
 	help
 	  This module adds support for the SPI interface of adapters using
-	  WILC1000 chipset. The Atmel WILC1000 has a Serial Peripheral
+	  WILC1000 & WILC3000 chipset. The Atmel WILC1000 has a Serial Peripheral
 	  Interface (SPI) that operates as a SPI slave. This SPI interface can
 	  be used for control and for serial I/O of 802.11 data. The SPI is a
 	  full-duplex slave synchronous serial interface that is available
 	  immediately following reset when pin 9 (SDIO_SPI_CFG) is tied to
 	  VDDIO. Select this if your platform is using the SPI bus.
+	  WILC3000 additionally supports BT 4.0 and BLE modes.
 
-config WILC1000_HW_OOB_INTR
-	bool "WILC1000 out of band interrupt"
-	depends on WILC1000_SDIO
+config WILC_HW_OOB_INTR
+	bool "WILC out of band interrupt"
+	depends on WILC_SDIO
+	default n
 	help
-	  This option enables out-of-band interrupt support for the WILC1000
-	  chipset. This OOB interrupt is intended to provide a faster interrupt
-	  mechanism for SDIO host controllers that don't support SDIO interrupt.
-	  Select this option If the SDIO host controller in your platform
-	  doesn't support SDIO time division interrupt.
+	  This option enables out-of-band interrupt support for the WILC1000 &
+	  WILC3000 chipset. This OOB interrupt is intended to provide a faster
+	  interrupt mechanism for SDIO host controllers that don't support SDIO
+	  interrupt. Select this option If the SDIO host controller in your
+	  platform doesn't support SDIO time division interrupt.

drivers/net/wireless/microchip/wilc1000/Makefile

@@ -1,13 +1,13 @@
 # SPDX-License-Identifier: GPL-2.0
 ccflags-y += -I$(src)/ -DWILC_DEBUGFS
 
-obj-$(CONFIG_WILC1000) += wilc1000.o
-
-wilc1000-objs := cfg80211.o netdev.o mon.o \
+wilc-objs := cfg80211.o netdev.o mon.o \
 			hif.o wlan_cfg.o wlan.o sysfs.o power.o bt.o debugfs.o
 
-obj-$(CONFIG_WILC1000_SDIO) += wilc1000-sdio.o
-wilc1000-sdio-objs += sdio.o
+obj-$(CONFIG_WILC_SDIO) += wilc-sdio.o
+wilc-sdio-objs += $(wilc-objs)
+wilc-sdio-objs += sdio.o
 
-obj-$(CONFIG_WILC1000_SPI) += wilc1000-spi.o
-wilc1000-spi-objs += spi.o
+obj-$(CONFIG_WILC_SPI) += wilc-spi.o
+wilc-spi-objs += $(wilc-objs)
+wilc-spi-objs += spi.o

drivers/net/wireless/microchip/wilc1000/bt.c

@@ -470,7 +470,6 @@ int wilc_bt_power_up(struct wilc *wilc, int source)
 	wilc_bt_power_down(wilc, DEV_BT);
 	return ret;
 }
-EXPORT_SYMBOL_GPL(wilc_bt_power_up);
 
 static void wilc_bt_firmware_download(struct wilc *wilc)
 {
@@ -681,7 +680,6 @@ void wilc_bt_init(struct wilc *wilc)
 	pr_debug("at_pwr_dev: init\n");
 	wilc_bt_create_device();
 }
-EXPORT_SYMBOL_GPL(wilc_bt_init);
 
 void wilc_bt_deinit(void)
 {
@@ -697,4 +695,3 @@ void wilc_bt_deinit(void)
 	unregister_chrdev_region(chc_dev_no, 1);
 	pr_info("at_pwr_dev: unregistered\n");
 }
-EXPORT_SYMBOL_GPL(wilc_bt_deinit);

drivers/net/wireless/microchip/wilc1000/cfg80211.c

@@ -44,7 +44,7 @@ static const struct ieee80211_txrx_stypes
 			BIT(IEEE80211_STYPE_DISASSOC >> 4) |
 			BIT(IEEE80211_STYPE_AUTH >> 4) |
 			BIT(IEEE80211_STYPE_DEAUTH >> 4)
-	}
+	},
 };
 
 #ifdef CONFIG_PM
@@ -2332,7 +2332,6 @@ int wilc_cfg80211_init(struct wilc **wilc, struct device *dev, int io_type,
 	wiphy_free(wl->wiphy);
 	return ret;
 }
-EXPORT_SYMBOL_GPL(wilc_cfg80211_init);
 
 struct wilc *wilc_create_wiphy(struct device *dev)
 {

drivers/net/wireless/microchip/wilc1000/netdev.c

@@ -1306,7 +1306,6 @@ void wilc_netdev_cleanup(struct wilc *wilc)
 	wiphy_free(wilc->wiphy);
 	pr_info("Module_exit Done.\n");
 }
-EXPORT_SYMBOL_GPL(wilc_netdev_cleanup);
 
 static u8 wilc_get_available_idx(struct wilc *wl)
 {

drivers/net/wireless/microchip/wilc1000/power.c

@@ -46,7 +46,6 @@ int wilc_of_parse_power_pins(struct wilc *wilc)
 	ret = devm_gpio_request(wilc->dev, power->gpios.reset, "RESET");
 	return ret;
 }
-EXPORT_SYMBOL_GPL(wilc_of_parse_power_pins);
 
 /**
  * wilc_wlan_power() - handle power on/off commands
@@ -75,4 +74,3 @@ void wilc_wlan_power(struct wilc *wilc, bool on)
 		gpio_direction_output(wilc->power.gpios.reset, 0);
 	}
 }
-EXPORT_SYMBOL_GPL(wilc_wlan_power);

drivers/net/wireless/microchip/wilc1000/wlan.c

@@ -727,7 +727,6 @@ void chip_allow_sleep(struct wilc *wilc, int source)
 	if (!ret)
 		wilc->keep_awake[source] = false;
 }
-EXPORT_SYMBOL_GPL(chip_allow_sleep);
 
 static void chip_wakeup_wilc1000(struct wilc *wilc, int source)
 {
@@ -861,7 +860,6 @@ void chip_wakeup(struct wilc *wilc, int source)
 	else
 		chip_wakeup_wilc3000(wilc, source);
 }
-EXPORT_SYMBOL_GPL(chip_wakeup);
 
 void host_wakeup_notify(struct wilc *wilc, int source)
 {
@@ -874,7 +872,6 @@ void host_wakeup_notify(struct wilc *wilc, int source)
 					      1);
 	release_bus(wilc, WILC_BUS_RELEASE_ONLY, source);
 }
-EXPORT_SYMBOL_GPL(host_wakeup_notify);
 
 void host_sleep_notify(struct wilc *wilc, int source)
 {
@@ -887,7 +884,6 @@ void host_sleep_notify(struct wilc *wilc, int source)
 					      1);
 	release_bus(wilc, WILC_BUS_RELEASE_ONLY, source);
 }
-EXPORT_SYMBOL_GPL(host_sleep_notify);
 
 int wilc_wlan_handle_txq(struct wilc *wilc, u32 *txq_count)
 {
@@ -1393,7 +1389,6 @@ void wilc_handle_isr(struct wilc *wilc)
 
 	release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP, DEV_WIFI);
 }
-EXPORT_SYMBOL_GPL(wilc_handle_isr);
 
 int wilc_wlan_firmware_download(struct wilc *wilc, const u8 *buffer,
 				u32 buffer_size)
@@ -1836,7 +1831,6 @@ u32 wilc_get_chipid(struct wilc *wilc, bool update)
 
 	return wilc->chipid;
 }
-EXPORT_SYMBOL_GPL(wilc_get_chipid);
 
 int wilc_wlan_init(struct net_device *dev)
 {