Skip to contentSkip to conversation

mmc: add SDIO identifiers for Broadcom WLAN devices

PATCH In review Arend van Spriel 1 participant 2 messages Dec 23, 2013 – Jan 4, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mmc: add SDIO identifiers for Broadcom WLAN devices

The SDIO identifier for Broadcom WLAN devices were defined in the brcmfmac SDIO driver. Moving the definitions in MMC header file seems common sense.

---
Moved vendor and device definitions in sdio_ids.h. Can split up in two patches but they are clearly related.

Regards,
Arend

---
 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c |    2 --
 drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c    |    1 +
 drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h    |    8 --------
 include/linux/mmc/sdio_ids.h                           |   10 ++++++++++
 4 files changed, 11 insertions(+), 10 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +0 -2
index 905704e..2274c64 100644
@@ -39,8 +39,6 @@
 #include "dhd_dbg.h"
 #include "dhd_bus.h"
 
-#define SDIO_VENDOR_ID_BROADCOM		0x02d0
-
 #define DMA_ALIGN_MASK	0x03
 
 #define SDIO_FUNC1_BLOCKSIZE		64
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c +1 -0
index 2096a14..a119808 100644
@@ -19,6 +19,7 @@
 #include <linux/netdevice.h>
 #include <linux/mmc/card.h>
 #include <linux/mmc/sdio_func.h>
+#include <linux/mmc/sdio_ids.h>
 #include <linux/ssb/ssb_regs.h>
 #include <linux/bcma/bcma.h>
 
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h +0 -8
index 507c61c..f0780ee 100644
@@ -54,14 +54,6 @@
 
 #define BRCMF_MAX_CORENUM	6
 
-/* SDIO device ID */
-#define SDIO_DEVICE_ID_BROADCOM_43143		43143
-#define SDIO_DEVICE_ID_BROADCOM_43241		0x4324
-#define SDIO_DEVICE_ID_BROADCOM_4329		0x4329
-#define SDIO_DEVICE_ID_BROADCOM_4330		0x4330
-#define SDIO_DEVICE_ID_BROADCOM_4334		0x4334
-#define SDIO_DEVICE_ID_BROADCOM_4335_4339	0x4335
-
 struct chip_core_info {
 	u16 id;
 	u16 rev;
include/linux/mmc/sdio_ids.h +10 -0
index 9f03fee..0f01fe0 100644
@@ -23,6 +23,16 @@
 /*
  * Vendors and devices.  Sort key: vendor first, device next.
  */
+#define SDIO_VENDOR_ID_BROADCOM			0x02d0
+#define SDIO_DEVICE_ID_BROADCOM_43143		43143
+#define SDIO_DEVICE_ID_BROADCOM_43241		0x4324
+#define SDIO_DEVICE_ID_BROADCOM_4329		0x4329
+#define SDIO_DEVICE_ID_BROADCOM_4330		0x4330
+#define SDIO_DEVICE_ID_BROADCOM_4334		0x4334
+#define SDIO_DEVICE_ID_BROADCOM_4335_4339	0x4335
+#define SDIO_DEVICE_ID_BROADCOM_43362		43362
+#define SDIO_DEVICE_ID_BROADCOM_4354		0x4354
+
 #define SDIO_VENDOR_ID_INTEL			0x0089
 #define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX	0x1402
 #define SDIO_DEVICE_ID_INTEL_IWMC3200WIFI	0x1403
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 10 lines · Arend van Spriel

The SDIO identifier for Broadcom WLAN devices were defined in the brcmfmac SDIO driver. Moving the definitions in MMC header file seems common sense.

---
Moved vendor and device definitions in sdio_ids.h. Can split up in two patches but they are clearly related.

Hi Chris,

Not sure whether you applied this one already, but I realized it might be better to move this one through the wireless tree to avoid merge conflicts. So please let me know if that is ok and I consider the patch dropped on your side.

Regards,
Arend

Quoted 74 lines

Regards,
Arend

---
  drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c |    2 --
  drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c    |    1 +
  drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h    |    8 --------
  include/linux/mmc/sdio_ids.h                           |   10 ++++++++++
  4 files changed, 11 insertions(+), 10 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +0 -2
index 905704e..2274c64 100644
@@ -39,8 +39,6 @@
  #include "dhd_dbg.h"
  #include "dhd_bus.h"
 
-#define SDIO_VENDOR_ID_BROADCOM		0x02d0
-
  #define DMA_ALIGN_MASK	0x03
 
  #define SDIO_FUNC1_BLOCKSIZE		64
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c +1 -0
index 2096a14..a119808 100644
@@ -19,6 +19,7 @@
  #include<linux/netdevice.h>
  #include<linux/mmc/card.h>
  #include<linux/mmc/sdio_func.h>
+#include<linux/mmc/sdio_ids.h>
  #include<linux/ssb/ssb_regs.h>
  #include<linux/bcma/bcma.h>
 
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h +0 -8
index 507c61c..f0780ee 100644
@@ -54,14 +54,6 @@
 
  #define BRCMF_MAX_CORENUM	6
 
-/* SDIO device ID */
-#define SDIO_DEVICE_ID_BROADCOM_43143		43143
-#define SDIO_DEVICE_ID_BROADCOM_43241		0x4324
-#define SDIO_DEVICE_ID_BROADCOM_4329		0x4329
-#define SDIO_DEVICE_ID_BROADCOM_4330		0x4330
-#define SDIO_DEVICE_ID_BROADCOM_4334		0x4334
-#define SDIO_DEVICE_ID_BROADCOM_4335_4339	0x4335
-
  struct chip_core_info {
  	u16 id;
  	u16 rev;
include/linux/mmc/sdio_ids.h +10 -0
index 9f03fee..0f01fe0 100644
@@ -23,6 +23,16 @@
  /*
   * Vendors and devices.  Sort key: vendor first, device next.
   */
+#define SDIO_VENDOR_ID_BROADCOM			0x02d0
+#define SDIO_DEVICE_ID_BROADCOM_43143		43143
+#define SDIO_DEVICE_ID_BROADCOM_43241		0x4324
+#define SDIO_DEVICE_ID_BROADCOM_4329		0x4329
+#define SDIO_DEVICE_ID_BROADCOM_4330		0x4330
+#define SDIO_DEVICE_ID_BROADCOM_4334		0x4334
+#define SDIO_DEVICE_ID_BROADCOM_4335_4339	0x4335
+#define SDIO_DEVICE_ID_BROADCOM_43362		43362
+#define SDIO_DEVICE_ID_BROADCOM_4354		0x4354
+
  #define SDIO_VENDOR_ID_INTEL			0x0089
  #define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX	0x1402
  #define SDIO_DEVICE_ID_INTEL_IWMC3200WIFI	0x1403