From: Michael Buesch <mb@bu3sch.de>
Date: Wed, 3 Sep 2008 10:31:54 +0000 (+0200)
Subject: b43: Replace hardcoded Analog switch
X-Git-Tag: v2.6.28-rc1~717^2~310^2~26
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0b7dcd9652c8d6b2a0dd04f3a3e6ca0574560042;p=linux-2.6-omap-h63xx.git

b43: Replace hardcoded Analog switch

Replace a hardcoded Analog switch (which breaks on N-PHY) by a call to
the switch_analog PHY operation.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index ab9fa8126b7..c836beceb10 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2718,7 +2718,8 @@ static int b43_chip_init(struct b43_wldev *dev)
 	if (err)
 		goto err_gpio_clean;
 
-	b43_write16(dev, 0x03E6, 0x0000);
+	/* Turn the Analog on and initialize the PHY. */
+	phy->ops->switch_analog(dev, 1);
 	err = b43_phy_init(dev);
 	if (err)
 		goto err_gpio_clean;