Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e08d757 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

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.

Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9df4d542

drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -47,8 +47,6 @@ 




#define SDIOH_API_ACCESS_RETRY_LIMIT	2

#define SDIOH_API_ACCESS_RETRY_LIMIT	2





#define SDIO_VENDOR_ID_BROADCOM		0x02d0



#define DMA_ALIGN_MASK	0x03

#define DMA_ALIGN_MASK	0x03





#define SDIO_FUNC1_BLOCKSIZE		64

#define SDIO_FUNC1_BLOCKSIZE		64

drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/netdevice.h>

#include <linux/netdevice.h>

#include <linux/mmc/card.h>

#include <linux/mmc/card.h>

#include <linux/mmc/sdio_func.h>

#include <linux/mmc/sdio_func.h>

#include <linux/mmc/sdio_ids.h>

#include <linux/ssb/ssb_regs.h>

#include <linux/ssb/ssb_regs.h>

#include <linux/bcma/bcma.h>

#include <linux/bcma/bcma.h>

drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h

+0 −8
Original line number Original line Diff line number Diff line
@@ -54,14 +54,6 @@ 




#define BRCMF_MAX_CORENUM	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 {

struct chip_core_info {

	u16 id;

	u16 id;

	u16 rev;

	u16 rev;

include/linux/mmc/sdio_ids.h

+9 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,15 @@ 
/*

/*

 * Vendors and devices.  Sort key: vendor first, device next.

 * 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_VENDOR_ID_INTEL			0x0089

#define SDIO_VENDOR_ID_INTEL			0x0089

#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX	0x1402

#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX	0x1402

#define SDIO_DEVICE_ID_INTEL_IWMC3200WIFI	0x1403

#define SDIO_DEVICE_ID_INTEL_IWMC3200WIFI	0x1403