From bc5842679e8333c68607dbf7d725b3828dc18f40 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Wed, 6 Feb 2013 18:40:45 +0100
Subject: [PATCH] --- yaml --- r: 352589 b: refs/heads/master c:
 75d907d3ee835f8759fe291023aa609dccebe504 h: refs/heads/master i:   352587:
 a83d908181374f26640b119c3817f36ef7370a95 v: v3

---
 [refs]                                                   | 2 +-
 trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h  | 4 ++++
 trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 2 ++
 trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c      | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3d156813d5aa..56d96e52212f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1701261d070e2077867fd08efe7b5977e3a130f9
+refs/heads/master: 75d907d3ee835f8759fe291023aa609dccebe504
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
index 6af7c9dce0f7..ad25c3408b59 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
@@ -64,6 +64,8 @@ struct brcmf_bus_ops {
  * @dstats: dongle-based statistical data.
  * @align: alignment requirement for the bus.
  * @dcmd_list: bus/device specific dongle initialization commands.
+ * @chip: device identifier of the dongle chip.
+ * @chiprev: revision of the dongle chip.
  */
 struct brcmf_bus {
 	union {
@@ -76,6 +78,8 @@ struct brcmf_bus {
 	uint maxctl;
 	unsigned long tx_realloc;
 	u8 align;
+	u32 chip;
+	u32 chiprev;
 	struct list_head dcmd_list;
 
 	struct brcmf_bus_ops *ops;
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index d424dd63077b..04680c56bafc 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -3927,6 +3927,8 @@ void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev)
 	/* Assign bus interface call back */
 	bus->sdiodev->bus_if->dev = bus->sdiodev->dev;
 	bus->sdiodev->bus_if->ops = &brcmf_sdio_bus_ops;
+	bus->sdiodev->bus_if->chip = bus->ci->chip;
+	bus->sdiodev->bus_if->chiprev = bus->ci->chiprev;
 
 	/* Attach to the brcmf/OS/network interface */
 	ret = brcmf_attach(SDPCM_RESERVE, bus->sdiodev->dev);
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index 06f7339b50b4..a55994d33763 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -1250,6 +1250,8 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo)
 	bus->bus_priv.usb = bus_pub;
 	dev_set_drvdata(dev, bus);
 	bus->ops = &brcmf_usb_bus_ops;
+	bus->chip = bus_pub->devid;
+	bus->chiprev = bus_pub->chiprev;
 
 	/* Attach to the common driver interface */
 	ret = brcmf_attach(0, dev);