From: Arend van Spriel <arend@broadcom.com>
To: Eric Caruso <ejcaruso@google.com>, <brudley@broadcom.com>,
<frankyl@broadcom.com>, <meuleman@broadcom.com>,
<kvalo@codeaurora.org>
Cc: <linux-wireless@vger.kernel.org>, <leizh@broadcom.com>,
<joe@perches.com>
Subject: Re: [PATCH v3] brcm80211: Add support for brcm4371
Date: Thu, 15 Oct 2015 11:39:05 +0200 [thread overview]
Message-ID: <561F7439.5020704@broadcom.com> (raw)
In-Reply-To: <1444851251-25368-1-git-send-email-ejcaruso@google.com>
On 10/14/2015 09:34 PM, Eric Caruso wrote:
> This is a new Broadcom chip and we should be able to recognize it.
Acked-by: Arend van Spriel <arend@broadcom.com>
> Signed-off-by: Eric Caruso <ejcaruso@google.com>
> ---
> v2: rebased.
> v3: added back break that got lost in v2.
>
> drivers/net/wireless/brcm80211/brcmfmac/chip.c | 1 +
> drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 9 +++++++++
> drivers/net/wireless/brcm80211/include/brcm_hw_ids.h | 2 ++
> 3 files changed, 12 insertions(+)
>
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/brcm80211/brcmfmac/chip.c
> index ffc3ace..f04833d 100644
> --- a/drivers/net/wireless/brcm80211/brcmfmac/chip.c
> +++ b/drivers/net/wireless/brcm80211/brcmfmac/chip.c
> @@ -682,6 +682,7 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci)
> case BRCM_CC_43570_CHIP_ID:
> case BRCM_CC_4358_CHIP_ID:
> case BRCM_CC_43602_CHIP_ID:
> + case BRCM_CC_4371_CHIP_ID:
> return 0x180000;
> case BRCM_CC_4365_CHIP_ID:
> case BRCM_CC_4366_CHIP_ID:
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
> index 30baf35..ebd7f2d 100644
> --- a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
> +++ b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
> @@ -59,6 +59,8 @@ enum brcmf_pcie_state {
> #define BRCMF_PCIE_4365_NVRAM_NAME "brcm/brcmfmac4365b-pcie.txt"
> #define BRCMF_PCIE_4366_FW_NAME "brcm/brcmfmac4366b-pcie.bin"
> #define BRCMF_PCIE_4366_NVRAM_NAME "brcm/brcmfmac4366b-pcie.txt"
> +#define BRCMF_PCIE_4371_FW_NAME "brcm/brcmfmac4371-pcie.bin"
> +#define BRCMF_PCIE_4371_NVRAM_NAME "brcm/brcmfmac4371-pcie.txt"
>
> #define BRCMF_PCIE_FW_UP_TIMEOUT 2000 /* msec */
>
> @@ -212,6 +214,8 @@ MODULE_FIRMWARE(BRCMF_PCIE_4365_FW_NAME);
> MODULE_FIRMWARE(BRCMF_PCIE_4365_NVRAM_NAME);
> MODULE_FIRMWARE(BRCMF_PCIE_4366_FW_NAME);
> MODULE_FIRMWARE(BRCMF_PCIE_4366_NVRAM_NAME);
> +MODULE_FIRMWARE(BRCMF_PCIE_4371_FW_NAME);
> +MODULE_FIRMWARE(BRCMF_PCIE_4371_NVRAM_NAME);
>
>
> struct brcmf_pcie_console {
> @@ -1456,6 +1460,10 @@ static int brcmf_pcie_get_fwnames(struct brcmf_pciedev_info *devinfo)
> fw_name = BRCMF_PCIE_4366_FW_NAME;
> nvram_name = BRCMF_PCIE_4366_NVRAM_NAME;
> break;
> + case BRCM_CC_4371_CHIP_ID:
> + fw_name = BRCMF_PCIE_4371_FW_NAME;
> + nvram_name = BRCMF_PCIE_4371_NVRAM_NAME;
> + break;
> default:
> brcmf_err("Unsupported chip 0x%04x\n", devinfo->ci->chip);
> return -ENODEV;
> @@ -1995,6 +2003,7 @@ static struct pci_device_id brcmf_pcie_devid_table[] = {
> BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_DEVICE_ID),
> BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_2G_DEVICE_ID),
> BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_5G_DEVICE_ID),
> + BRCMF_PCIE_DEVICE(BRCM_PCIE_4371_DEVICE_ID),
> { /* end: all zeroes */ }
> };
>
> diff --git a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
> index d823734..aa06ea2 100644
> --- a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
> +++ b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
> @@ -50,6 +50,7 @@
> #define BRCM_CC_43602_CHIP_ID 43602
> #define BRCM_CC_4365_CHIP_ID 0x4365
> #define BRCM_CC_4366_CHIP_ID 0x4366
> +#define BRCM_CC_4371_CHIP_ID 0x4371
>
> /* USB Device IDs */
> #define BRCM_USB_43143_DEVICE_ID 0xbd1e
> @@ -75,6 +76,7 @@
> #define BRCM_PCIE_4366_DEVICE_ID 0x43c3
> #define BRCM_PCIE_4366_2G_DEVICE_ID 0x43c4
> #define BRCM_PCIE_4366_5G_DEVICE_ID 0x43c5
> +#define BRCM_PCIE_4371_DEVICE_ID 0x440d
>
>
> /* brcmsmac IDs */
>
next prev parent reply other threads:[~2015-10-15 9:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-14 19:34 [PATCH v3] brcm80211: Add support for brcm4371 Eric Caruso
2015-10-15 9:39 ` Arend van Spriel [this message]
2015-10-21 7:58 ` [v3] " Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=561F7439.5020704@broadcom.com \
--to=arend@broadcom.com \
--cc=brudley@broadcom.com \
--cc=ejcaruso@google.com \
--cc=frankyl@broadcom.com \
--cc=joe@perches.com \
--cc=kvalo@codeaurora.org \
--cc=leizh@broadcom.com \
--cc=linux-wireless@vger.kernel.org \
--cc=meuleman@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.