diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-21 11:56:56 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-21 11:56:56 +0000 |
| commit | 019b742d063772fce1bb63e1a98a17874c4e2505 (patch) | |
| tree | 7adc43fac8e6661dd81f1f38efb2b522f7946a82 | |
| parent | 1df1bdc7eac53c0acb88fc05032a64e88945d67a (diff) | |
patch-libertas-88w8688-vid-pid.patch
Add the observed vid, pid and model numbers for Marvell 88W8688
Signed-off-by: Andy Green <andy@openmoko.com>
| -rw-r--r-- | drivers/net/wireless/libertas/if_sdio.c | 8 | ||||
| -rw-r--r-- | include/linux/mmc/sdio_ids.h | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c index b54e2ea8346..54ae0d08a23 100644 --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c @@ -48,6 +48,7 @@ module_param_named(fw_name, lbs_fw_name, charp, 0644); static const struct sdio_device_id if_sdio_ids[] = { { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_LIBERTAS) }, + { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_88W8688) }, { /* end: all zeroes */ }, }; @@ -72,7 +73,12 @@ static struct if_sdio_model if_sdio_models[] = { .helper = "sd8686_helper.bin", .firmware = "sd8686.bin", }, -}; + { + /* 8688 */ + .model = 0x10, + .helper = "sd8688_helper.bin", + .firmware = "sd8688.bin", + },}; struct if_sdio_packet { struct if_sdio_packet *next; diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 5c16d8f7a1d..27061909203 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -25,6 +25,7 @@ #define SDIO_VENDOR_ID_MARVELL 0x02df #define SDIO_DEVICE_ID_MARVELL_LIBERTAS 0x9103 +#define SDIO_DEVICE_ID_MARVELL_88W8688 0x9104 #define SDIO_VENDOR_ID_ATHEROS 0x0271 #define SDIO_DEVICE_ID_ATHEROS_AR6000 0x0100 |