From patchwork Fri Aug 14 11:51:59 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: 41422 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 n7EBvxdJ005085 for ; Fri, 14 Aug 2009 11:57:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755548AbZHNL54 (ORCPT ); Fri, 14 Aug 2009 07:57:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755524AbZHNL5z (ORCPT ); Fri, 14 Aug 2009 07:57:55 -0400 Received: from mail-bw0-f222.google.com ([209.85.218.222]:42716 "EHLO mail-bw0-f222.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755307AbZHNL5z (ORCPT ); Fri, 14 Aug 2009 07:57:55 -0400 Received: by bwz22 with SMTP id 22so1097844bwz.18 for ; Fri, 14 Aug 2009 04:57:54 -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=TQSpgFAg04olKvW3F4u/pkgw2xFBi5UlO2uNN00czEo=; b=XkJEos76gDCGlrkZE2FRMqn50exL52BeqTauipLDmE0aCRMGK7yvNqG2ClUUlDBZxJ 5cefYJYxwpNeFXA31InKbpUMs82Pr9OR//eRL8ZWwyY3EjkTQP/e4v93KAgOSve+pFoB EjG6iXwMPKkNcz9ERA/oQZRlPgJqeGUxWGu6Y= 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=n/811my8FGXzuy4dPkC8EDfNfTkkTAO58a5FeMu7ZX3jY+oEcRiZNcHplOKTfZ7zuw sPOhb2wdtLIP2oHfF51u2t8f/sM/bLkoRkFbfPeeqeIk/exwBVP1zja3bZEToJJzdXqc IU4Wgt/oFAiWEfZK2gs3qrmlNQ2Inh7wju+qc= Received: by 10.103.122.23 with SMTP id z23mr619890mum.32.1250250719856; Fri, 14 Aug 2009 04:51:59 -0700 (PDT) Received: from ?192.168.1.5? (pool-02f2c.externet.hu [88.209.217.43]) by mx.google.com with ESMTPS id e9sm6150012muf.2.2009.08.14.04.51.58 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 14 Aug 2009 04:51:59 -0700 (PDT) Message-ID: <4A854FDF.5020208@gmail.com> Date: Fri, 14 Aug 2009 13:51:59 +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: Add LP-PHY firmware loading support Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Add support for loading LP-PHY firmware to b43_try_request_fw. Signed-off-by: Gábor Stefanik --- For anyone hoping that the channel switch patches will make their LP card work - this is also definitely required. Mark, this doesn't fix your problem specifically, but it will be needed after your problem is fixed. drivers/net/wireless/b43/main.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index fbcbe4f..1e657fe 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -2062,8 +2062,12 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx) filename = "ucode5"; else if ((rev >= 11) && (rev <= 12)) filename = "ucode11"; - else if (rev >= 13) + else if (rev == 13) filename = "ucode13"; + else if (rev == 14) + filename = "ucode14"; + else if (rev >= 15) + filename = "ucode15"; else goto err_no_ucode; err = b43_do_request_fw(ctx, filename, &fw->ucode); @@ -2111,6 +2115,15 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx) else goto err_no_initvals; break; + case B43_PHYTYPE_LP: + if (rev == 13) + filename = "lp0initvals13"; + else if (rev == 14) + filename = "lp0initvals14"; + else if (rev >= 15) + filename = "lp0initvals15"; + else + goto err_no_initvals; default: goto err_no_initvals; } @@ -2145,6 +2158,15 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx) else goto err_no_initvals; break; + case B43_PHYTYPE_LP: + if (rev == 13) + filename = "lp0bsinitvals13"; + else if (rev == 14) + filename = "lp0bsinitvals14"; + else if (rev >= 15) + filename = "lp0bsinitvals15"; + else + goto err_no_initvals; default: goto err_no_initvals; }