Commit eaa3d9fa authored by Yogesh Ashok Powar's avatar Yogesh Ashok Powar Committed by Kalle Valo
Browse files

mwifiex: add support for USB8801 



USB8801 is Marvell's 1x1 802.11bgn offering.
Patch adds Device IDs support and defines TX buffer size.

Signed-off-by: default avatarYogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarNishant Sarmukadam <nishants@marvell.com>
Signed-off-by: default avatarCathy Luo <cluo@marvell.com>
Signed-off-by: default avatarFrank Huang <frankh@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 52bd3d20

drivers/net/wireless/mwifiex/usb.c

+13 −0
Original line number Diff line number Diff line
@@ -37,6 +37,11 @@ static struct usb_device_id mwifiex_usb_table[] = { 
	{USB_DEVICE_AND_INTERFACE_INFO(USB8XXX_VID, USB8797_PID_2,

				       USB_CLASS_VENDOR_SPEC,

				       USB_SUBCLASS_VENDOR_SPEC, 0xff)},

	/* 8801 */

	{USB_DEVICE(USB8XXX_VID, USB8801_PID_1)},

	{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,
@@ -361,11 +366,13 @@ static int mwifiex_usb_probe(struct usb_interface *intf, 
	switch (id_product) {

	case USB8766_PID_1:

	case USB8797_PID_1:

	case USB8801_PID_1:

	case USB8897_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:

		card->usb_boot_state = USB8XXX_FW_READY;

		break;
@@ -798,6 +805,11 @@ static int mwifiex_register_dev(struct mwifiex_adapter *adapter) 
		adapter->tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K;

		strcpy(adapter->fw_name, USB8766_DEFAULT_FW_NAME);

		break;

	case USB8801_PID_1:

	case USB8801_PID_2:

		adapter->tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K;

		strcpy(adapter->fw_name, USB8801_DEFAULT_FW_NAME);

		break;

	case USB8797_PID_1:

	case USB8797_PID_2:

	default:
@@ -1083,4 +1095,5 @@ MODULE_VERSION(USB_VERSION); 
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);

drivers/net/wireless/mwifiex/usb.h

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ 
#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 USB8XXX_FW_DNLD		1

#define USB8XXX_FW_READY	2
@@ -41,6 +44,7 @@ 


#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 FW_DNLD_TX_BUF_SIZE	620

CRA Git | Maintained and supported by SUSTech CRA and CCSE