Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60a188a2 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by Kalle Valo
Browse files

mwifiex: remove USB8897 chipset support 



We don't have any customer using this chipset via USB
interface. if both mwifiex_pcie and mwifiex_usb modules
are enabled by user, sometimes mwifiex_usb wins the race
even if user wants wlan interface to be on PCIe and
USB for bluetooth. This patch solves the problem.

Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarFrank Huang <frankh@marvell.com>
Signed-off-by: default avatarNishant Sarmukadam <nishants@marvell.com>
Signed-off-by: default avatarCathy Luo <cluo@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 406df18f

drivers/net/wireless/mwifiex/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -33,12 +33,12 @@ config MWIFIEX_PCIE 
	  mwifiex_pcie.



config MWIFIEX_USB

	tristate "Marvell WiFi-Ex Driver for USB8766/8797/8897/8997"

	tristate "Marvell WiFi-Ex Driver for USB8766/8797/8997"

	depends on MWIFIEX && USB

	select FW_LOADER

	---help---

	  This adds support for wireless adapters based on Marvell

	  8797/8897/8997 chipset with USB interface.

	  8797/8997 chipset with USB interface.



	  If you choose to build it as a module, it will be called

	  mwifiex_usb.

drivers/net/wireless/mwifiex/usb.c

+0 −14
Original line number Diff line number Diff line
@@ -42,11 +42,6 @@ static struct usb_device_id mwifiex_usb_table[] = { 
	{USB_DEVICE_AND_INTERFACE_INFO(USB8XXX_VID, USB8801_PID_2,

				       USB_CLASS_VENDOR_SPEC,

				       USB_SUBCLASS_VENDOR_SPEC, 0xff)},

	/* 8897 */

	{USB_DEVICE(USB8XXX_VID, USB8897_PID_1)},

	{USB_DEVICE_AND_INTERFACE_INFO(USB8XXX_VID, USB8897_PID_2,

				       USB_CLASS_VENDOR_SPEC,

				       USB_SUBCLASS_VENDOR_SPEC, 0xff)},

	/* 8997 */

	{USB_DEVICE(USB8XXX_VID, USB8997_PID_1)},

	{USB_DEVICE_AND_INTERFACE_INFO(USB8XXX_VID, USB8997_PID_2,
@@ -403,14 +398,12 @@ static int mwifiex_usb_probe(struct usb_interface *intf, 
	case USB8766_PID_1:

	case USB8797_PID_1:

	case USB8801_PID_1:

	case USB8897_PID_1:

	case USB8997_PID_1:

		card->usb_boot_state = USB8XXX_FW_DNLD;

		break;

	case USB8766_PID_2:

	case USB8797_PID_2:

	case USB8801_PID_2:

	case USB8897_PID_2:

	case USB8997_PID_2:

		card->usb_boot_state = USB8XXX_FW_READY;

		break;
@@ -964,12 +957,6 @@ static int mwifiex_register_dev(struct mwifiex_adapter *adapter) 
		strcpy(adapter->fw_name, USB8997_DEFAULT_FW_NAME);

		adapter->ext_scan = true;

		break;

	case USB8897_PID_1:

	case USB8897_PID_2:

		adapter->tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_4K;

		strcpy(adapter->fw_name, USB8897_DEFAULT_FW_NAME);

		adapter->ext_scan = true;

		break;

	case USB8766_PID_1:

	case USB8766_PID_2:

		adapter->tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K;
@@ -1277,5 +1264,4 @@ MODULE_LICENSE("GPL v2"); 
MODULE_FIRMWARE(USB8766_DEFAULT_FW_NAME);

MODULE_FIRMWARE(USB8797_DEFAULT_FW_NAME);

MODULE_FIRMWARE(USB8801_DEFAULT_FW_NAME);

MODULE_FIRMWARE(USB8897_DEFAULT_FW_NAME);

MODULE_FIRMWARE(USB8997_DEFAULT_FW_NAME);

drivers/net/wireless/mwifiex/usb.h

+0 −3
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 
#define USB8766_PID_2		0x2042

#define USB8797_PID_1		0x2043

#define USB8797_PID_2		0x2044

#define USB8897_PID_1		0x2045

#define USB8897_PID_2		0x2046

#define USB8801_PID_1		0x2049

#define USB8801_PID_2		0x204a

#define USB8997_PID_1		0x204d
@@ -48,7 +46,6 @@ 
#define USB8766_DEFAULT_FW_NAME	"mrvl/usb8766_uapsta.bin"

#define USB8797_DEFAULT_FW_NAME	"mrvl/usb8797_uapsta.bin"

#define USB8801_DEFAULT_FW_NAME	"mrvl/usb8801_uapsta.bin"

#define USB8897_DEFAULT_FW_NAME	"mrvl/usb8897_uapsta.bin"

#define USB8997_DEFAULT_FW_NAME	"mrvl/usb8997_uapsta.bin"



#define FW_DNLD_TX_BUF_SIZE	620