Commit 36677874 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville

b43: use agent R/W ops for BCMA_IOCTL

BCMA_IOCTL is register in agent (AKA wrapper) core, we need to use
special R/W ops for it.
Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 02c5172c
...@@ -2814,12 +2814,12 @@ void b43_mac_phy_clock_set(struct b43_wldev *dev, bool on) ...@@ -2814,12 +2814,12 @@ void b43_mac_phy_clock_set(struct b43_wldev *dev, bool on)
switch (dev->dev->bus_type) { switch (dev->dev->bus_type) {
#ifdef CONFIG_B43_BCMA #ifdef CONFIG_B43_BCMA
case B43_BUS_BCMA: case B43_BUS_BCMA:
tmp = bcma_read32(dev->dev->bdev, BCMA_IOCTL); tmp = bcma_aread32(dev->dev->bdev, BCMA_IOCTL);
if (on) if (on)
tmp |= B43_BCMA_IOCTL_MACPHYCLKEN; tmp |= B43_BCMA_IOCTL_MACPHYCLKEN;
else else
tmp &= ~B43_BCMA_IOCTL_MACPHYCLKEN; tmp &= ~B43_BCMA_IOCTL_MACPHYCLKEN;
bcma_write32(dev->dev->bdev, BCMA_IOCTL, tmp); bcma_awrite32(dev->dev->bdev, BCMA_IOCTL, tmp);
break; break;
#endif #endif
#ifdef CONFIG_B43_SSB #ifdef CONFIG_B43_SSB
......
...@@ -611,12 +611,12 @@ static void b43_nphy_bmac_clock_fgc(struct b43_wldev *dev, bool force) ...@@ -611,12 +611,12 @@ static void b43_nphy_bmac_clock_fgc(struct b43_wldev *dev, bool force)
switch (dev->dev->bus_type) { switch (dev->dev->bus_type) {
#ifdef CONFIG_B43_BCMA #ifdef CONFIG_B43_BCMA
case B43_BUS_BCMA: case B43_BUS_BCMA:
tmp = bcma_read32(dev->dev->bdev, BCMA_IOCTL); tmp = bcma_aread32(dev->dev->bdev, BCMA_IOCTL);
if (force) if (force)
tmp |= BCMA_IOCTL_FGC; tmp |= BCMA_IOCTL_FGC;
else else
tmp &= ~BCMA_IOCTL_FGC; tmp &= ~BCMA_IOCTL_FGC;
bcma_write32(dev->dev->bdev, BCMA_IOCTL, tmp); bcma_awrite32(dev->dev->bdev, BCMA_IOCTL, tmp);
break; break;
#endif #endif
#ifdef CONFIG_B43_SSB #ifdef CONFIG_B43_SSB
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment