From patchwork Mon Nov 10 22:02:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 40545 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 17713218DE for ; Mon, 10 Nov 2014 22:02:39 +0000 (UTC) Received: by mail-la0-f72.google.com with SMTP id mc6sf5717478lab.11 for ; Mon, 10 Nov 2014 14:02:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=Nn7lUks1K+oqzylghy0gevNoNDnKWOe1YAxaTBzEdKA=; b=E9Lo0LBuTjZWVHZrkG6S3TrGxCWpFdKHz67AeTd00+ZB+3azEAQLyE8l0m5F36qAQu sXtpL7s5UAPW6qo2kNN6NKbrWb6HiJCMsGtlo+RakKdvuFaL1wcBhIu15t7Sn7vEGuiJ HbdyArKKZXoAv97Xx0H2ep9317fY2wnYauinX5Sq/rAeSl6j951ZLP1KI/XYbUpYPxvK VHykZZT4QZIEbuZmSYWS3D0NnDGfCX1Z6B+DlQZRlNLjSypHi0Q5/F4YK3z25CliLTUl VR86YPhU1dFhhobOYirY6ZUhZBLE9lhT5yjjnWv1de3cuhFrdnYhbP3YSwuFKCssPV92 otaQ== X-Gm-Message-State: ALoCoQkRCR4V4WtXpxcZdbXdm2Rr/jiIYGsZZYlR0eMa8T6uvqheRefS+QjgEEoo1+T4FdGSapbB X-Received: by 10.180.74.196 with SMTP id w4mr4514800wiv.7.1415656958026; Mon, 10 Nov 2014 14:02:38 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.7 with SMTP id o7ls104031lao.55.gmail; Mon, 10 Nov 2014 14:02:37 -0800 (PST) X-Received: by 10.112.63.70 with SMTP id e6mr5374029lbs.93.1415656957779; Mon, 10 Nov 2014 14:02:37 -0800 (PST) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id w6si29081895lad.65.2014.11.10.14.02.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Nov 2014 14:02:37 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by mail-lb0-f181.google.com with SMTP id l4so6554145lbv.40 for ; Mon, 10 Nov 2014 14:02:37 -0800 (PST) X-Received: by 10.112.14.69 with SMTP id n5mr32448535lbc.34.1415656957665; Mon, 10 Nov 2014 14:02:37 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp170732lbc; Mon, 10 Nov 2014 14:02:36 -0800 (PST) X-Received: by 10.69.16.99 with SMTP id fv3mr26538613pbd.43.1415656956015; Mon, 10 Nov 2014 14:02:36 -0800 (PST) Received: from mail-pa0-f49.google.com (mail-pa0-f49.google.com. [209.85.220.49]) by mx.google.com with ESMTPS id kk7si17980546pab.117.2014.11.10.14.02.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Nov 2014 14:02:36 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.49 as permitted sender) client-ip=209.85.220.49; Received: by mail-pa0-f49.google.com with SMTP id lj1so9078505pab.22 for ; Mon, 10 Nov 2014 14:02:35 -0800 (PST) X-Received: by 10.68.227.104 with SMTP id rz8mr35262103pbc.4.1415656955210; Mon, 10 Nov 2014 14:02:35 -0800 (PST) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id eb7sm16112923pad.9.2014.11.10.14.02.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Nov 2014 14:02:34 -0800 (PST) From: John Stultz To: Arend van Spriel Cc: John Stultz , Samuel Ortiz , Rob Herring , brcm80211 development Subject: [PATCH 3/3] brcmfmac: Enable use of 43340/43341 specific firmware files Date: Mon, 10 Nov 2014 14:02:20 -0800 Message-Id: <1415656940-27199-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1415656940-27199-1-git-send-email-john.stultz@linaro.org> References: <1415656940-27199-1-git-send-email-john.stultz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Since the 4334 firmware doesn't seem to work for me with my 43341 device, add support for the seprately provided 43340 firmware. With this patch, I am able to use the wlan device. Cc: Samuel Ortiz Cc: Rob Herring Cc: brcm80211 development Signed-off-by: John Stultz --- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c index 0d3fe86..f5defb1 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c @@ -608,6 +608,8 @@ static const struct sdiod_drive_str sdiod_drvstr_tab2_3v3[] = { #define BCM4330_NVRAM_NAME "brcm/brcmfmac4330-sdio.txt" #define BCM4334_FIRMWARE_NAME "brcm/brcmfmac4334-sdio.bin" #define BCM4334_NVRAM_NAME "brcm/brcmfmac4334-sdio.txt" +#define BCM43340_FIRMWARE_NAME "brcm/brcmfmac43340-sdio.bin" +#define BCM43340_NVRAM_NAME "brcm/brcmfmac43340-sdio.txt" #define BCM4335_FIRMWARE_NAME "brcm/brcmfmac4335-sdio.bin" #define BCM4335_NVRAM_NAME "brcm/brcmfmac4335-sdio.txt" #define BCM43362_FIRMWARE_NAME "brcm/brcmfmac43362-sdio.bin" @@ -629,6 +631,8 @@ MODULE_FIRMWARE(BCM4330_FIRMWARE_NAME); MODULE_FIRMWARE(BCM4330_NVRAM_NAME); MODULE_FIRMWARE(BCM4334_FIRMWARE_NAME); MODULE_FIRMWARE(BCM4334_NVRAM_NAME); +MODULE_FIRMWARE(BCM43340_FIRMWARE_NAME); +MODULE_FIRMWARE(BCM43340_NVRAM_NAME); MODULE_FIRMWARE(BCM4335_FIRMWARE_NAME); MODULE_FIRMWARE(BCM4335_NVRAM_NAME); MODULE_FIRMWARE(BCM43362_FIRMWARE_NAME); @@ -660,8 +664,8 @@ static const struct brcmf_firmware_names brcmf_fwname_data[] = { { BRCM_CC_4329_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4329) }, { BRCM_CC_4330_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4330) }, { BRCM_CC_4334_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4334) }, - { BRCM_CC_43340_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4334) }, - { BRCM_CC_43341_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4334) }, + { BRCM_CC_43340_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM43340) }, + { BRCM_CC_43341_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM43340) }, { BRCM_CC_4335_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4335) }, { BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, BRCMF_FIRMWARE_NVRAM(BCM43362) }, { BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4339) },