From patchwork Mon Nov 10 22:02:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 40544 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 768ED218DE for ; Mon, 10 Nov 2014 22:02:37 +0000 (UTC) Received: by mail-lb0-f200.google.com with SMTP id f15sf4692756lbj.7 for ; Mon, 10 Nov 2014 14:02:36 -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=l977r7nFnrOXrXoJ936ny+MfUT+N/MIvE2H0HcKJKsw=; b=anQkiH5VfROJvphV2q5auL2QDuOH4JwrHkbxsKhPW3w1revy0SfBmFmWhNaEDg2W09 T9ylBXJuQfntQu1Sg3H4E9wBMAqklkr2tO2MXb0R+L20AToGmw+PnokuTq/yYAaH61iR fxVLfs/II1sYqnvZJ+JNboSyYTdjJqh/kqmTDfEKDZYjSEtwehQJVvHBaJWi2y3U8W+V xw5ZGlS0yiE/vlZ5ltdhfzHjNqME3gHjTbl4iUHCG+u3sFAyAlyVtvxhTGvw3Jm8Dy23 w+kjPgtBzSwzRDugLQ6aVWs58xFnRQIGXoZskn3quOAI+DlXLY+OWOwK+EzMFCwJ9uDU t+7A== X-Gm-Message-State: ALoCoQlU4EM0lSwueHjXRTcKCJPVEZWvUaA0irLdsJiealoLvFTxVkQxQ0d5VGQAz59Y7lzKrevp X-Received: by 10.112.89.195 with SMTP id bq3mr2157586lbb.9.1415656956384; Mon, 10 Nov 2014 14:02:36 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.2.200 with SMTP id 8ls102311law.102.gmail; Mon, 10 Nov 2014 14:02:36 -0800 (PST) X-Received: by 10.152.234.227 with SMTP id uh3mr32761443lac.69.1415656955992; Mon, 10 Nov 2014 14:02:35 -0800 (PST) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id ro8si29064807lbb.75.2014.11.10.14.02.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Nov 2014 14:02:35 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by mail-lb0-f172.google.com with SMTP id w7so6724402lbi.3 for ; Mon, 10 Nov 2014 14:02:35 -0800 (PST) X-Received: by 10.112.52.37 with SMTP id q5mr32164597lbo.32.1415656955617; Mon, 10 Nov 2014 14:02:35 -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 ew9csp170729lbc; Mon, 10 Nov 2014 14:02:34 -0800 (PST) X-Received: by 10.70.98.141 with SMTP id ei13mr35574406pdb.65.1415656953931; Mon, 10 Nov 2014 14:02:33 -0800 (PST) Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com. [209.85.220.42]) by mx.google.com with ESMTPS id yj7si18045346pab.49.2014.11.10.14.02.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Nov 2014 14:02:33 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.42 as permitted sender) client-ip=209.85.220.42; Received: by mail-pa0-f42.google.com with SMTP id bj1so9192039pad.1 for ; Mon, 10 Nov 2014 14:02:33 -0800 (PST) X-Received: by 10.68.213.138 with SMTP id ns10mr35073900pbc.50.1415656953200; Mon, 10 Nov 2014 14:02:33 -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.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Nov 2014 14:02:31 -0800 (PST) From: John Stultz To: Arend van Spriel Cc: John Stultz , Samuel Ortiz , Rob Herring , brcm80211 development Subject: [PATCH 2/3] brcmfmac: Add support for bcm43341 wireless chipset Date: Mon, 10 Nov 2014 14:02:19 -0800 Message-Id: <1415656940-27199-2-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.172 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: , This patch adds support for the bcm43341 wireless chip, using similar mechanism as the previous 43340 enablement which reuses the 4334 firmware. Note: with my 43341 hardware, the 4334 firmware doesn't seem to work for me, and I see: brcmfmac: brcmf_sdio_htclk: HT Avail timeout (1000000): clkctl 0x50 errors and the wlan device never appears. Cc: Samuel Ortiz Cc: Rob Herring Cc: brcm80211 development Signed-off-by: John Stultz --- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 1 + drivers/net/wireless/brcm80211/brcmfmac/chip.c | 1 + drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 1 + drivers/net/wireless/brcm80211/include/brcm_hw_ids.h | 2 ++ include/linux/mmc/sdio_ids.h | 1 + 5 files changed, 6 insertions(+) diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c index b8755d5..258306e 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c @@ -1006,6 +1006,7 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = { BRCMF_SDIO_DEVICE(BRCM_SDIO_4330_DEVICE_ID), BRCMF_SDIO_DEVICE(BRCM_SDIO_4334_DEVICE_ID), BRCMF_SDIO_DEVICE(BRCM_SDIO_43340_DEVICE_ID), + BRCMF_SDIO_DEVICE(BRCM_SDIO_43341_DEVICE_ID), BRCMF_SDIO_DEVICE(BRCM_SDIO_43362_DEVICE_ID), BRCMF_SDIO_DEVICE(BRCM_SDIO_4335_4339_DEVICE_ID), BRCMF_SDIO_DEVICE(BRCM_SDIO_4354_DEVICE_ID), diff --git a/drivers/net/wireless/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/brcm80211/brcmfmac/chip.c index 6904ed0..5156523 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/chip.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/chip.c @@ -496,6 +496,7 @@ static void brcmf_chip_get_raminfo(struct brcmf_chip_priv *ci) break; case BRCM_CC_4334_CHIP_ID: case BRCM_CC_43340_CHIP_ID: + case BRCM_CC_43341_CHIP_ID: ci->pub.ramsize = 0x80000; break; case BRCM_CC_4335_CHIP_ID: diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c index cb32a92..0d3fe86 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c @@ -661,6 +661,7 @@ static const struct brcmf_firmware_names brcmf_fwname_data[] = { { 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_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) }, diff --git a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h index 0ec2966..a6139ca 100644 --- a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h +++ b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h @@ -35,6 +35,7 @@ #define BRCM_CC_4330_CHIP_ID 0x4330 #define BRCM_CC_4334_CHIP_ID 0x4334 #define BRCM_CC_43340_CHIP_ID 43340 +#define BRCM_CC_43341_CHIP_ID 43341 #define BRCM_CC_43362_CHIP_ID 43362 #define BRCM_CC_4335_CHIP_ID 0x4335 #define BRCM_CC_4339_CHIP_ID 0x4339 @@ -53,6 +54,7 @@ #define BRCM_SDIO_4330_DEVICE_ID BRCM_CC_4330_CHIP_ID #define BRCM_SDIO_4334_DEVICE_ID BRCM_CC_4334_CHIP_ID #define BRCM_SDIO_43340_DEVICE_ID BRCM_CC_43340_CHIP_ID +#define BRCM_SDIO_43341_DEVICE_ID BRCM_CC_43341_CHIP_ID #define BRCM_SDIO_43362_DEVICE_ID BRCM_CC_43362_CHIP_ID #define BRCM_SDIO_4335_4339_DEVICE_ID BRCM_CC_4335_CHIP_ID #define BRCM_SDIO_4354_DEVICE_ID BRCM_CC_4354_CHIP_ID diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 8cc8210..61f8318 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -30,6 +30,7 @@ #define SDIO_DEVICE_ID_BROADCOM_4330 0x4330 #define SDIO_DEVICE_ID_BROADCOM_4334 0x4334 #define SDIO_DEVICE_ID_BROADCOM_43340 43340 +#define SDIO_DEVICE_ID_BROADCOM_43341 43341 #define SDIO_DEVICE_ID_BROADCOM_4335_4339 0x4335 #define SDIO_DEVICE_ID_BROADCOM_43362 43362 #define SDIO_DEVICE_ID_BROADCOM_4354 0x4354