From patchwork Fri Aug 14 12:54:46 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?G=C3=A1bor_Stefanik?= X-Patchwork-Id: 41443 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7ECsnr5017010 for ; Fri, 14 Aug 2009 12:54:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756676AbZHNMyr (ORCPT ); Fri, 14 Aug 2009 08:54:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755428AbZHNMyr (ORCPT ); Fri, 14 Aug 2009 08:54:47 -0400 Received: from mail-bw0-f222.google.com ([209.85.218.222]:53533 "EHLO mail-bw0-f222.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754873AbZHNMyq (ORCPT ); Fri, 14 Aug 2009 08:54:46 -0400 Received: by bwz22 with SMTP id 22so1123698bwz.18 for ; Fri, 14 Aug 2009 05:54:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=XDBxAzJ8aVU1XHwpTia1fif5QOc4VIOHqojtERsFlHg=; b=NsAmxNW9mHv4cdVmFec2a1BltLRC2K4Y9K5s5BYtpb3yP2Q/KeP1sOZ/46vm4ZaA8d k/H31kdyHRssbqhJwh7LSIqpvX1qzg7Hc0K36CiwZ3acF40SFDtprKX9Iq5d4mXLoTFa 3ziBu1BIhZz395+vHxRUl4BDzY8vP1uIbWwIo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=mvXl3Zg9ZFBekHPcc5K9DtfwswgQ4ncPFLOaglUNWbgBAkYcgwI1kYCLfEPm3nxIX3 OilrKp2OG8X4dxFl06kjokhyohDGZiAJLYUiCYzEGPcP92ePT7eDYQjTAV5MoWQJTFuV meXejgYgApPlQIJ1I8u5aVx5I1PYbkeu5itrI= Received: by 10.103.226.17 with SMTP id d17mr434524mur.104.1250254486183; Fri, 14 Aug 2009 05:54:46 -0700 (PDT) Received: from ?192.168.1.5? (pool-02f2c.externet.hu [88.209.217.43]) by mx.google.com with ESMTPS id j2sm6673738mue.20.2009.08.14.05.54.44 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 14 Aug 2009 05:54:45 -0700 (PDT) Message-ID: <4A855E96.3090202@gmail.com> Date: Fri, 14 Aug 2009 14:54:46 +0200 From: =?UTF-8?B?R8OhYm9yIFN0ZWZhbmlr?= User-Agent: Thunderbird 2.0.0.22 (Windows/20090605) MIME-Version: 1.0 To: John Linville , Michael Buesch , Larry Finger , Mark Huijgen CC: Broadcom Wireless , linux-wireless Subject: [PATCH] b43: Make LP-PHY testable Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org -Enable rate memory init for LP-PHY (same as G and N-PHY). -Mark rev.2 LP-PHYs with the B2063 radio as supported. -Allow using the 5GHz band on LP-PHYs. Signed-off-by: Gábor Stefanik --- drivers/net/wireless/b43/main.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 3ca3e93..5559b22 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -2674,6 +2674,7 @@ static void b43_rate_memory_init(struct b43_wldev *dev) case B43_PHYTYPE_A: case B43_PHYTYPE_G: case B43_PHYTYPE_N: + case B43_PHYTYPE_LP: b43_rate_memory_write(dev, B43_OFDM_RATE_6MB, 1); b43_rate_memory_write(dev, B43_OFDM_RATE_12MB, 1); b43_rate_memory_write(dev, B43_OFDM_RATE_18MB, 1); @@ -3888,7 +3889,7 @@ static int b43_phy_versioning(struct b43_wldev *dev) #endif #ifdef CONFIG_B43_PHY_LP case B43_PHYTYPE_LP: - if (phy_rev > 1) + if (phy_rev > 2) unsupported = 1; break; #endif @@ -3945,7 +3946,7 @@ static int b43_phy_versioning(struct b43_wldev *dev) unsupported = 1; break; case B43_PHYTYPE_LP: - if (radio_ver != 0x2062) + if (radio_ver != 0x2062 && radio_ver != 0x2063) unsupported = 1; break; default: @@ -4588,9 +4589,10 @@ static int b43_wireless_core_attach(struct b43_wldev *dev) case B43_PHYTYPE_A: have_5ghz_phy = 1; break; + case B43_PHYTYPE_LP: //FIXME not always! + have_5ghz_phy = 1; case B43_PHYTYPE_G: case B43_PHYTYPE_N: - case B43_PHYTYPE_LP: have_2ghz_phy = 1; break; default: @@ -4605,7 +4607,8 @@ static int b43_wireless_core_attach(struct b43_wldev *dev) } if (1 /* disable A-PHY */) { /* FIXME: For now we disable the A-PHY on multi-PHY devices. */ - if (dev->phy.type != B43_PHYTYPE_N) { + if (dev->phy.type != B43_PHYTYPE_N && + dev->phy.type != B43_PHYTYPE_LP) { have_2ghz_phy = 1; have_5ghz_phy = 0; }