aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-12-02 16:07:43 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2012-12-02 16:07:43 +0000
commit3399d16dd78ef3a6c2b3af632590a97fd8d09f2d (patch)
tree5ce93cbce899a5ca4469a43f8208361ba1e0650f
parentc233a088f05e263671b2bac26e384db348760516 (diff)
downloadupstream-3399d16dd78ef3a6c2b3af632590a97fd8d09f2d.tar.gz
upstream-3399d16dd78ef3a6c2b3af632590a97fd8d09f2d.tar.bz2
upstream-3399d16dd78ef3a6c2b3af632590a97fd8d09f2d.zip
broadcom-wl: get the mmio address directly from the struct if bcma is used.
SVN-Revision: 34452
-rw-r--r--package/broadcom-wl/src/glue/wl_glue.c4
1 files changed, 1 insertions, 3 deletions
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)
{