From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-ww0-f42.google.com ([74.125.82.42]:41072 "EHLO mail-ww0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755550Ab2CFV3P (ORCPT ); Tue, 6 Mar 2012 16:29:15 -0500 Received: by wgbds11 with SMTP id ds11so39810wgb.1 for ; Tue, 06 Mar 2012 13:29:14 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: linux-wireless@vger.kernel.org, "John W. Linville" , Hauke Mehrtens Cc: b43-dev@lists.infradead.org, larry.finger@lwfinger.net, florian@openwrt.org, m@bues.ch, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [RFT][PATCH] b43: fix logic in GPIO configuration Date: Tue, 6 Mar 2012 23:11:38 +0100 Message-Id: <1331071898-3651-1-git-send-email-zajec5@gmail.com> (sfid-20120306_222919_245153_408D44CA) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: By using reverted mask we were taking over pins we were not supporsed to touch. After fixing this workaround for BCM5354 should not be needed anymore. Signed-off-by: Rafał Miłecki --- drivers/net/wireless/b43/main.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 1d633f3..8a89885 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -2706,8 +2706,6 @@ static int b43_gpio_init(struct b43_wldev *dev) mask |= 0x0060; set |= 0x0060; } - if (dev->dev->chip_id == 0x5354) - set &= 0xff02; if (0 /* FIXME: conditional unknown */ ) { b43_write16(dev, B43_MMIO_GPIO_MASK, b43_read16(dev, B43_MMIO_GPIO_MASK) @@ -2730,7 +2728,7 @@ static int b43_gpio_init(struct b43_wldev *dev) case B43_BUS_BCMA: bcma_cc_write32(&dev->dev->bdev->bus->drv_cc, BCMA_CC_GPIOCTL, (bcma_cc_read32(&dev->dev->bdev->bus->drv_cc, - BCMA_CC_GPIOCTL) & mask) | set); + BCMA_CC_GPIOCTL) & ~mask) | set); break; #endif #ifdef CONFIG_B43_SSB @@ -2739,7 +2737,7 @@ static int b43_gpio_init(struct b43_wldev *dev) if (gpiodev) ssb_write32(gpiodev, B43_GPIO_CONTROL, (ssb_read32(gpiodev, B43_GPIO_CONTROL) - & mask) | set); + & ~mask) | set); break; #endif } -- 1.7.3.4