From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 2 Dec 2012 16:07:43 +0000 (+0000)
Subject: broadcom-wl: get the mmio address directly from the struct if bcma is used.
X-Git-Tag: reboot~12130
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3399d16dd78ef3a6c2b3af632590a97fd8d09f2d;p=openwrt%2Fopenwrt.git

broadcom-wl: get the mmio address directly from the struct if bcma is used.

SVN-Revision: 34452
---

diff --git a/package/broadcom-wl/src/glue/wl_glue.c b/package/broadcom-wl/src/glue/wl_glue.c
index 0504232a96..bf009e5bbe 100644
--- a/package/broadcom-wl/src/glue/wl_glue.c
+++ b/package/broadcom-wl/src/glue/wl_glue.c
@@ -88,7 +88,6 @@ static struct ssb_driver wl_glue_ssb_driver = {
 #ifdef CONFIG_BCMA
 static int wl_glue_bcma_probe(struct bcma_device *dev)
 {
-	void *mmio;
 	void *wldev;
 
 	if (!attach_cb)
@@ -109,8 +108,7 @@ static int wl_glue_bcma_probe(struct bcma_device *dev)
 	 * 0x1000     = BCMA_CORE_SIZE
 	 */
 
-	mmio = (void *) 0x18000000 + dev->core_index * 0x1000;
-	wldev = attach_cb(dev->id.manuf, dev->id.id, (ulong)mmio, dev, dev->irq);
+	wldev = attach_cb(dev->id.manuf, dev->id.id, (ulong)dev->io_addr, dev, dev->irq);
 
 	if (!wldev)
 	{