diff options
author | Yogesh Ashok Powar <yogeshp@marvell.com> | 2015-01-23 06:39:18 -0500 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2015-01-27 13:18:18 -0500 |
commit | eaa3d9fa08c55555aedd967d4bfe7fe03c41cfaf (patch) | |
tree | aad1af4313ce3b7d8d2cf1feb79c89447580e1d5 | |
parent | 52bd3d2023d4740850a2e30c7f24f18f5fe9d462 (diff) |
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: Yogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Nishant Sarmukadam <nishants@marvell.com>
Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: Frank Huang <frankh@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-rw-r--r-- | drivers/net/wireless/mwifiex/usb.c | 13 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/usb.h | 4 |
2 files changed, 17 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwifiex/usb.c b/drivers/net/wireless/mwifiex/usb.c index 6c62995028e6..50517b78d965 100644 --- a/drivers/net/wireless/mwifiex/usb.c +++ b/drivers/net/wireless/mwifiex/usb.c | |||
@@ -37,6 +37,11 @@ static struct usb_device_id mwifiex_usb_table[] = { | |||
37 | {USB_DEVICE_AND_INTERFACE_INFO(USB8XXX_VID, USB8797_PID_2, | 37 | {USB_DEVICE_AND_INTERFACE_INFO(USB8XXX_VID, USB8797_PID_2, |
38 | USB_CLASS_VENDOR_SPEC, | 38 | USB_CLASS_VENDOR_SPEC, |
39 | USB_SUBCLASS_VENDOR_SPEC, 0xff)}, | 39 | USB_SUBCLASS_VENDOR_SPEC, 0xff)}, |
40 | /* 8801 */ | ||
41 | {USB_DEVICE(USB8XXX_VID, USB8801_PID_1)}, | ||
42 | {USB_DEVICE_AND_INTERFACE_INFO(USB8XXX_VID, USB8801_PID_2, | ||
43 | USB_CLASS_VENDOR_SPEC, | ||
44 | USB_SUBCLASS_VENDOR_SPEC, 0xff)}, | ||
40 | /* 8897 */ | 45 | /* 8897 */ |
41 | {USB_DEVICE(USB8XXX_VID, USB8897_PID_1)}, | 46 | {USB_DEVICE(USB8XXX_VID, USB8897_PID_1)}, |
42 | {USB_DEVICE_AND_INTERFACE_INFO(USB8XXX_VID, USB8897_PID_2, | 47 | {USB_DEVICE_AND_INTERFACE_INFO(USB8XXX_VID, USB8897_PID_2, |
@@ -361,11 +366,13 @@ static int mwifiex_usb_probe(struct usb_interface *intf, | |||
361 | switch (id_product) { | 366 | switch (id_product) { |
362 | case USB8766_PID_1: | 367 | case USB8766_PID_1: |
363 | case USB8797_PID_1: | 368 | case USB8797_PID_1: |
369 | case USB8801_PID_1: | ||
364 | case USB8897_PID_1: | 370 | case USB8897_PID_1: |
365 | card->usb_boot_state = USB8XXX_FW_DNLD; | 371 | card->usb_boot_state = USB8XXX_FW_DNLD; |
366 | break; | 372 | break; |
367 | case USB8766_PID_2: | 373 | case USB8766_PID_2: |
368 | case USB8797_PID_2: | 374 | case USB8797_PID_2: |
375 | case USB8801_PID_2: | ||
369 | case USB8897_PID_2: | 376 | case USB8897_PID_2: |
370 | card->usb_boot_state = USB8XXX_FW_READY; | 377 | card->usb_boot_state = USB8XXX_FW_READY; |
371 | break; | 378 | break; |
@@ -798,6 +805,11 @@ static int mwifiex_register_dev(struct mwifiex_adapter *adapter) | |||
798 | adapter->tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K; | 805 | adapter->tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K; |
799 | strcpy(adapter->fw_name, USB8766_DEFAULT_FW_NAME); | 806 | strcpy(adapter->fw_name, USB8766_DEFAULT_FW_NAME); |
800 | break; | 807 | break; |
808 | case USB8801_PID_1: | ||
809 | case USB8801_PID_2: | ||
810 | adapter->tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K; | ||
811 | strcpy(adapter->fw_name, USB8801_DEFAULT_FW_NAME); | ||
812 | break; | ||
801 | case USB8797_PID_1: | 813 | case USB8797_PID_1: |
802 | case USB8797_PID_2: | 814 | case USB8797_PID_2: |
803 | default: | 815 | default: |
@@ -1083,4 +1095,5 @@ MODULE_VERSION(USB_VERSION); | |||
1083 | MODULE_LICENSE("GPL v2"); | 1095 | MODULE_LICENSE("GPL v2"); |
1084 | MODULE_FIRMWARE(USB8766_DEFAULT_FW_NAME); | 1096 | MODULE_FIRMWARE(USB8766_DEFAULT_FW_NAME); |
1085 | MODULE_FIRMWARE(USB8797_DEFAULT_FW_NAME); | 1097 | MODULE_FIRMWARE(USB8797_DEFAULT_FW_NAME); |
1098 | MODULE_FIRMWARE(USB8801_DEFAULT_FW_NAME); | ||
1086 | MODULE_FIRMWARE(USB8897_DEFAULT_FW_NAME); | 1099 | MODULE_FIRMWARE(USB8897_DEFAULT_FW_NAME); |
diff --git a/drivers/net/wireless/mwifiex/usb.h b/drivers/net/wireless/mwifiex/usb.h index 0ad1bebc3f93..57e1a5736318 100644 --- a/drivers/net/wireless/mwifiex/usb.h +++ b/drivers/net/wireless/mwifiex/usb.h | |||
@@ -30,6 +30,9 @@ | |||
30 | #define USB8797_PID_2 0x2044 | 30 | #define USB8797_PID_2 0x2044 |
31 | #define USB8897_PID_1 0x2045 | 31 | #define USB8897_PID_1 0x2045 |
32 | #define USB8897_PID_2 0x2046 | 32 | #define USB8897_PID_2 0x2046 |
33 | #define USB8801_PID_1 0x2049 | ||
34 | #define USB8801_PID_2 0x204a | ||
35 | |||
33 | 36 | ||
34 | #define USB8XXX_FW_DNLD 1 | 37 | #define USB8XXX_FW_DNLD 1 |
35 | #define USB8XXX_FW_READY 2 | 38 | #define USB8XXX_FW_READY 2 |
@@ -41,6 +44,7 @@ | |||
41 | 44 | ||
42 | #define USB8766_DEFAULT_FW_NAME "mrvl/usb8766_uapsta.bin" | 45 | #define USB8766_DEFAULT_FW_NAME "mrvl/usb8766_uapsta.bin" |
43 | #define USB8797_DEFAULT_FW_NAME "mrvl/usb8797_uapsta.bin" | 46 | #define USB8797_DEFAULT_FW_NAME "mrvl/usb8797_uapsta.bin" |
47 | #define USB8801_DEFAULT_FW_NAME "mrvl/usb8801_uapsta.bin" | ||
44 | #define USB8897_DEFAULT_FW_NAME "mrvl/usb8897_uapsta.bin" | 48 | #define USB8897_DEFAULT_FW_NAME "mrvl/usb8897_uapsta.bin" |
45 | 49 | ||
46 | #define FW_DNLD_TX_BUF_SIZE 620 | 50 | #define FW_DNLD_TX_BUF_SIZE 620 |