| Message ID | 1422013159-3093-1-git-send-email-patila@marvell.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Kalle Valo |
| Headers | show |
On Fri, Jan 23, 2015 at 05:09:17PM +0530, Avinash Patil wrote: > From: Yogesh Ashok Powar <yogeshp@marvell.com> > > SD8801 is Marvell's 1x1 802.11bgn offering. > This patch adds Device IDs for SD8801 and also defines card > structure which has definition for register offsets, buffer sizes etc. > > 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> Reviewed-by: James Cameron <quozl@laptop.org> (Not tested, still on 8787 with 3.5).
> From: Yogesh Ashok Powar <yogeshp@marvell.com> > > SD8801 is Marvell's 1x1 802.11bgn offering. > This patch adds Device IDs for SD8801 and also defines card > structure which has definition for register offsets, buffer sizes etc. > > 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> > Reviewed-by: James Cameron <quozl@laptop.org> Thanks, 3 patches applied to wireless-drivers-next.git: 52bd3d2023d4 mwifiex: add support for SD8801 eaa3d9fa08c5 mwifiex: add support for USB8801 1fe192d8d63f mwifiex: selectively choose ext_scan support Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c index a70f1033..cee107f 100644 --- a/drivers/net/wireless/mwifiex/sdio.c +++ b/drivers/net/wireless/mwifiex/sdio.c @@ -282,6 +282,9 @@ static int mwifiex_sdio_suspend(struct device *dev) #define SDIO_DEVICE_ID_MARVELL_8897 (0x912d) /* Device ID for SD8887 */ #define SDIO_DEVICE_ID_MARVELL_8887 (0x9135) +/* Device ID for SD8801 */ +#define SDIO_DEVICE_ID_MARVELL_8801 (0x9139) + /* WLAN IDs */ static const struct sdio_device_id mwifiex_ids[] = { @@ -295,6 +298,8 @@ static const struct sdio_device_id mwifiex_ids[] = { .driver_data = (unsigned long) &mwifiex_sdio_sd8897}, {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8887), .driver_data = (unsigned long)&mwifiex_sdio_sd8887}, + {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8801), + .driver_data = (unsigned long)&mwifiex_sdio_sd8801}, {}, }; diff --git a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/mwifiex/sdio.h index 895eea0..a4bb0db 100644 --- a/drivers/net/wireless/mwifiex/sdio.h +++ b/drivers/net/wireless/mwifiex/sdio.h @@ -34,6 +34,7 @@ #define SD8797_DEFAULT_FW_NAME "mrvl/sd8797_uapsta.bin" #define SD8897_DEFAULT_FW_NAME "mrvl/sd8897_uapsta.bin" #define SD8887_DEFAULT_FW_NAME "mrvl/sd8887_uapsta.bin" +#define SD8801_DEFAULT_FW_NAME "mrvl/sd8801_uapsta.bin" #define BLOCK_MODE 1 #define BYTE_MODE 0 @@ -474,6 +475,20 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8887 = { .auto_tdls = true, }; +static const struct mwifiex_sdio_device mwifiex_sdio_sd8801 = { + .firmware = SD8801_DEFAULT_FW_NAME, + .reg = &mwifiex_reg_sd87xx, + .max_ports = 16, + .mp_agg_pkt_limit = 8, + .supports_sdio_new_mode = false, + .has_control_mask = true, + .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K, + .mp_tx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_16K, + .mp_rx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_16K, + .supports_fw_dump = false, + .auto_tdls = false, +}; + /* * .cmdrsp_complete handler */