diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-07-23 11:25:05 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-07-23 11:25:05 +0000 |
| commit | 96b6f272714e24f6aa03f3be2f41fcf3deed1048 (patch) | |
| tree | 3c52643d66d169d4160a6aeebb760f2117d244f6 /package/mac80211/patches/830-b43-read-correct-register-on-bcma-bus.patch | |
| parent | 49f4d4217eb6b2aa709eade9ca80f145f8a422bd (diff) | |
| download | master-31e0f0ae-96b6f272714e24f6aa03f3be2f41fcf3deed1048.tar.gz master-31e0f0ae-96b6f272714e24f6aa03f3be2f41fcf3deed1048.tar.bz2 master-31e0f0ae-96b6f272714e24f6aa03f3be2f41fcf3deed1048.zip | |
mca80211: add support for b43 on bcma bus.
This makes b43 work on broadcom SoCs using bcma as system bus.
SVN-Revision: 27734
Diffstat (limited to 'package/mac80211/patches/830-b43-read-correct-register-on-bcma-bus.patch')
| -rw-r--r-- | package/mac80211/patches/830-b43-read-correct-register-on-bcma-bus.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/package/mac80211/patches/830-b43-read-correct-register-on-bcma-bus.patch b/package/mac80211/patches/830-b43-read-correct-register-on-bcma-bus.patch new file mode 100644 index 0000000000..8d88a66b50 --- /dev/null +++ b/package/mac80211/patches/830-b43-read-correct-register-on-bcma-bus.patch @@ -0,0 +1,40 @@ +From f706821596d8a3dcda314c38b13d91f108fdc435 Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens <hauke@hauke-m.de> +Date: Fri, 22 Jul 2011 17:10:29 +0200 +Subject: [PATCH 21/22] b43: read correct register on bcma bus. + + +Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> +--- + drivers/net/wireless/b43/dma.c | 20 +++++++++++++++++--- + 1 files changed, 17 insertions(+), 3 deletions(-) + +--- a/drivers/net/wireless/b43/dma.c ++++ b/drivers/net/wireless/b43/dma.c +@@ -795,9 +795,23 @@ static u64 supported_dma_mask(struct b43 + u32 tmp; + u16 mmio_base; + +- tmp = b43_read32(dev, SSB_TMSHIGH); +- if (tmp & SSB_TMSHIGH_DMA64) +- return DMA_BIT_MASK(64); ++ switch (dev->dev->bus_type) { ++#ifdef CONFIG_B43_BCMA ++ case B43_BUS_BCMA: ++ tmp = bcma_aread32(dev->dev->bdev, BCMA_IOST); ++ if (tmp & BCMA_IOST_DMA64) ++ return DMA_BIT_MASK(64); ++ break; ++#endif ++#ifdef CONFIG_B43_SSB ++ case B43_BUS_SSB: ++ tmp = ssb_read32(dev->dev->sdev, SSB_TMSHIGH); ++ if (tmp & SSB_TMSHIGH_DMA64) ++ return DMA_BIT_MASK(64); ++ break; ++#endif ++ } ++ + mmio_base = b43_dmacontroller_base(0, 0); + b43_write32(dev, mmio_base + B43_DMA32_TXCTL, B43_DMA32_TXADDREXT_MASK); + tmp = b43_read32(dev, mmio_base + B43_DMA32_TXCTL); |