lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

b43: add helper for finding GPIO device

Browse Source 
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Rafał Miłecki
2011-05-17 18:57:27 +02:00
committed by John W. Linville
parent 05100a29cb
commit c4a2a08165
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/net/wireless/b43/main.c
View File

@@ -2556,10 +2556,20 @@ out:
/* Initialize the GPIOs /* Initialize the GPIOs
* http://bcm-specs.sipsolutions.net/GPIO * http://bcm-specs.sipsolutions.net/GPIO
*/ */
static int b43_gpio_init(struct b43_wldev *dev) static struct ssb_device *b43_ssb_gpio_dev(struct b43_wldev *dev)
{ {
struct ssb_bus *bus = dev->sdev->bus; struct ssb_bus *bus = dev->sdev->bus;
struct ssb_device *gpiodev, *pcidev = NULL;
#ifdef CONFIG_SSB_DRIVER_PCICORE
return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev);
#else
return bus->chipco.dev;
#endif
}
static int b43_gpio_init(struct b43_wldev *dev)
{
struct ssb_device *gpiodev;
u32 mask, set; u32 mask, set;
b43_write32(dev, B43_MMIO_MACCTL, b43_read32(dev, B43_MMIO_MACCTL) b43_write32(dev, B43_MMIO_MACCTL, b43_read32(dev, B43_MMIO_MACCTL)
@@ -2591,15 +2601,11 @@ static int b43_gpio_init(struct b43_wldev *dev)
if (dev->sdev->id.revision >= 2) if (dev->sdev->id.revision >= 2)
mask |= 0x0010; /* FIXME: This is redundant. */ mask |= 0x0010; /* FIXME: This is redundant. */
#ifdef CONFIG_SSB_DRIVER_PCICORE gpiodev = b43_ssb_gpio_dev(dev);
pcidev = bus->pcicore.dev; if (gpiodev)
#endif ssb_write32(gpiodev, B43_GPIO_CONTROL,
gpiodev = bus->chipco.dev ? : pcidev; (ssb_read32(gpiodev, B43_GPIO_CONTROL)
if (!gpiodev) & mask) | set);
return 0;
ssb_write32(gpiodev, B43_GPIO_CONTROL,
(ssb_read32(gpiodev, B43_GPIO_CONTROL)
& mask) | set);
return 0; return 0;
} }
@@ -2607,16 +2613,11 @@ static int b43_gpio_init(struct b43_wldev *dev)
/* Turn off all GPIO stuff. Call this on module unload, for example. */ /* Turn off all GPIO stuff. Call this on module unload, for example. */
static void b43_gpio_cleanup(struct b43_wldev *dev) static void b43_gpio_cleanup(struct b43_wldev *dev)
{ {
struct ssb_bus *bus = dev->sdev->bus; struct ssb_device *gpiodev;
struct ssb_device *gpiodev, *pcidev = NULL;
#ifdef CONFIG_SSB_DRIVER_PCICORE gpiodev = b43_ssb_gpio_dev(dev);
pcidev = bus->pcicore.dev; if (gpiodev)
#endif ssb_write32(gpiodev, B43_GPIO_CONTROL, 0);
gpiodev = bus->chipco.dev ? : pcidev;
if (!gpiodev)
return;
ssb_write32(gpiodev, B43_GPIO_CONTROL, 0);
} }
/* http://bcm-specs.sipsolutions.net/EnableMac */ /* http://bcm-specs.sipsolutions.net/EnableMac */