diff options
author | Bing Zhao <bzhao@marvell.com> | 2011-11-16 23:40:35 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-11-17 15:45:19 -0500 |
commit | e3bea1c8751d297c197949db01aa1e7adbc1104d (patch) | |
tree | 188650f4f4a1fc57106d92215e7dcc40106f9198 /drivers/net/wireless/mwifiex/sdio.c | |
parent | 7adb92faa852589ad60ebd5ff94fc53c0882ebd5 (diff) |
mwifiex: add support for Marvell sd8797 device
This patch supports Marvell chipset 88W8797 (Avastar) with
SDIO interface.
The corresponding firmware image file is located at:
"mrvl/sd8797_uapsta.bin"
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: Tristan Xu <xurf@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kiran Divekar <dkiran@marvell.com>
Signed-off-by: Frank Huang <frankh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwifiex/sdio.c')
-rw-r--r-- | drivers/net/wireless/mwifiex/sdio.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c index ffaf3f3a57df..702452b505c3 100644 --- a/drivers/net/wireless/mwifiex/sdio.c +++ b/drivers/net/wireless/mwifiex/sdio.c | |||
@@ -256,10 +256,13 @@ static int mwifiex_sdio_resume(struct device *dev) | |||
256 | 256 | ||
257 | /* Device ID for SD8787 */ | 257 | /* Device ID for SD8787 */ |
258 | #define SDIO_DEVICE_ID_MARVELL_8787 (0x9119) | 258 | #define SDIO_DEVICE_ID_MARVELL_8787 (0x9119) |
259 | /* Device ID for SD8797 */ | ||
260 | #define SDIO_DEVICE_ID_MARVELL_8797 (0x9129) | ||
259 | 261 | ||
260 | /* WLAN IDs */ | 262 | /* WLAN IDs */ |
261 | static const struct sdio_device_id mwifiex_ids[] = { | 263 | static const struct sdio_device_id mwifiex_ids[] = { |
262 | {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787)}, | 264 | {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787)}, |
265 | {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8797)}, | ||
263 | {}, | 266 | {}, |
264 | }; | 267 | }; |
265 | 268 | ||
@@ -1573,7 +1576,16 @@ static int mwifiex_register_dev(struct mwifiex_adapter *adapter) | |||
1573 | sdio_set_drvdata(func, card); | 1576 | sdio_set_drvdata(func, card); |
1574 | 1577 | ||
1575 | adapter->dev = &func->dev; | 1578 | adapter->dev = &func->dev; |
1576 | strcpy(adapter->fw_name, SD8787_DEFAULT_FW_NAME); | 1579 | |
1580 | switch (func->device) { | ||
1581 | case SDIO_DEVICE_ID_MARVELL_8797: | ||
1582 | strcpy(adapter->fw_name, SD8797_DEFAULT_FW_NAME); | ||
1583 | break; | ||
1584 | case SDIO_DEVICE_ID_MARVELL_8787: | ||
1585 | default: | ||
1586 | strcpy(adapter->fw_name, SD8787_DEFAULT_FW_NAME); | ||
1587 | break; | ||
1588 | } | ||
1577 | 1589 | ||
1578 | return 0; | 1590 | return 0; |
1579 | 1591 | ||
@@ -1774,4 +1786,5 @@ MODULE_AUTHOR("Marvell International Ltd."); | |||
1774 | MODULE_DESCRIPTION("Marvell WiFi-Ex SDIO Driver version " SDIO_VERSION); | 1786 | MODULE_DESCRIPTION("Marvell WiFi-Ex SDIO Driver version " SDIO_VERSION); |
1775 | MODULE_VERSION(SDIO_VERSION); | 1787 | MODULE_VERSION(SDIO_VERSION); |
1776 | MODULE_LICENSE("GPL v2"); | 1788 | MODULE_LICENSE("GPL v2"); |
1777 | MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin"); | 1789 | MODULE_FIRMWARE(SD8787_DEFAULT_FW_NAME); |
1790 | MODULE_FIRMWARE(SD8797_DEFAULT_FW_NAME); | ||