aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCindy H Kao <cindy.h.kao@intel.com>2009-09-04 20:38:46 -0400
committerInaky Perez-Gonzalez <inaky@linux.intel.com>2009-10-19 02:55:59 -0400
commitf8fc3295570115267ce1ce901f362d13d194aefc (patch)
tree7546bcfa99081af6c6898a36d7abb6b6dea8d726
parent10607c86e163e3da8bdf58a934da7dd3a68dcb7c (diff)
wimax/iwmc3200: add new sdio device ID to support iwmc3200 2.5GHz sku
Different sdio device IDs are designated to support different intel wimax silicon sku. The new macro SDIO_DEVICE_ID_IWMC3200_WIMAX_2G5(0x1407) is added to support iwmc3200 2.5GHz sku. The existing SDIO_DEVICE_ID_IWMC3200_WIMAX(0x1402) is for iwmc3200 general sku. Signed-off-by: Cindy H Kao <cindy.h.kao@intel.com> Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
-rw-r--r--drivers/net/wimax/i2400m/sdio.c2
-rw-r--r--include/linux/mmc/sdio_ids.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wimax/i2400m/sdio.c b/drivers/net/wimax/i2400m/sdio.c
index 2d2cc5ac6d86..de158ee0c32c 100644
--- a/drivers/net/wimax/i2400m/sdio.c
+++ b/drivers/net/wimax/i2400m/sdio.c
@@ -550,6 +550,8 @@ const struct sdio_device_id i2400ms_sdio_ids[] = {
550 /* Intel: i2400m WiMAX (iwmc3200) over SDIO */ 550 /* Intel: i2400m WiMAX (iwmc3200) over SDIO */
551 { SDIO_DEVICE(SDIO_VENDOR_ID_INTEL, 551 { SDIO_DEVICE(SDIO_VENDOR_ID_INTEL,
552 SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX) }, 552 SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX) },
553 { SDIO_DEVICE(SDIO_VENDOR_ID_INTEL,
554 SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX_2G5) },
553 { /* end: all zeroes */ }, 555 { /* end: all zeroes */ },
554}; 556};
555MODULE_DEVICE_TABLE(sdio, i2400ms_sdio_ids); 557MODULE_DEVICE_TABLE(sdio, i2400ms_sdio_ids);
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index 2dbfb5a05994..33b2ea09a4ad 100644
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -28,6 +28,7 @@
28#define SDIO_DEVICE_ID_INTEL_IWMC3200TOP 0x1404 28#define SDIO_DEVICE_ID_INTEL_IWMC3200TOP 0x1404
29#define SDIO_DEVICE_ID_INTEL_IWMC3200GPS 0x1405 29#define SDIO_DEVICE_ID_INTEL_IWMC3200GPS 0x1405
30#define SDIO_DEVICE_ID_INTEL_IWMC3200BT 0x1406 30#define SDIO_DEVICE_ID_INTEL_IWMC3200BT 0x1406
31#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX_2G5 0x1407
31 32
32#define SDIO_VENDOR_ID_MARVELL 0x02df 33#define SDIO_VENDOR_ID_MARVELL 0x02df
33#define SDIO_DEVICE_ID_MARVELL_LIBERTAS 0x9103 34#define SDIO_DEVICE_ID_MARVELL_LIBERTAS 0x9103