From patchwork Tue Jan 26 16:57:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 8124861 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4AD91BEEE5 for ; Tue, 26 Jan 2016 16:57:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 68AFF2026D for ; Tue, 26 Jan 2016 16:57:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 54BD920266 for ; Tue, 26 Jan 2016 16:57:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966946AbcAZQ5o (ORCPT ); Tue, 26 Jan 2016 11:57:44 -0500 Received: from mail-lf0-f52.google.com ([209.85.215.52]:36146 "EHLO mail-lf0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966826AbcAZQ5i (ORCPT ); Tue, 26 Jan 2016 11:57:38 -0500 Received: by mail-lf0-f52.google.com with SMTP id h129so110092566lfh.3 for ; Tue, 26 Jan 2016 08:57:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=YyFJ84f1qyw7Lp2zIADw066s+ODTL1zLO8+tvHyXmjI=; b=IuWCqme5K4yqgrlfLylXAM7eTC2yd+/vnxJpcvrCcpe2FoeKoCNpKN0jf6qr2Ewmwc 4tTkmnjPF04PycuqJIyJi/zAkVz+I/TexK7WxfPKil+kNsOKZMBDIvs2ocqgPnS12JIY hEcN0nLaUIvGxs5TB/oPCC2GOjav7L/1uqr7ZRhn8Bwjdk0tbjXlYpKXu8mq84f/SNd4 I6UL0zHIEBFFy4wKN0A+EPBM3p6cwWkPkBmRiY0VoV5UQkBu1e+R6jM+sXo71/LHBuKr GErTu9dDvM6aiiPKUqcAAJ/Us2aFHI7ed7NSASqvL6z8fKvu1cuiNe0RajKotcgIa9IO hFuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=YyFJ84f1qyw7Lp2zIADw066s+ODTL1zLO8+tvHyXmjI=; b=Iz3vLOS9xqUE2YkX41OMMkKwE6xQhp8NFgv/y9droWrNq7LS+St8vFGlpTUaXTRs+k /QE4zNZ2FPCURoHXhcDkzRpb+gWVhZdlovIJ/ZCMHUr2mZ+G+RHXJHxxQQ3QIpkLVOjx RaYFVCYrXE1aynMGiKHUG+ViABP5GKq93wfjBdL9F/a9zHc0qky7vJ/TgQHLW8KN0pAT 7xGbwo5l1pFAAq1BF7if/KtcHMv26acMJNAcCxy+JZfIq4PP3Mf8agb6Z1kr9GEm1eOu 09I/rtb6fnZzj10ZjkCFxL0MGcjmksRAX++EGboClwTNfBFRDAiW2PyP8ZZa6ARHx+u9 2rwg== X-Gm-Message-State: AG10YORvhsbxOheXaZsSG1dG4M6UGJyFD4/3Ktk+Qtgm1boK8QY8BUVsmUpmeBbidlLjjg== X-Received: by 10.25.20.39 with SMTP id k39mr678063lfi.152.1453827457180; Tue, 26 Jan 2016 08:57:37 -0800 (PST) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id h187sm292998lfg.18.2016.01.26.08.57.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jan 2016 08:57:36 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Kalle Valo , linux-wireless@vger.kernel.org Cc: Brett Rudley , Arend van Spriel , "Franky (Zhenhui) Lin" , Hante Meuleman , brcm80211-dev-list@broadcom.com, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH 5/5] brcmfmac: add support for 14e4:4365 PCI ID with BCM4366 chipset Date: Tue, 26 Jan 2016 17:57:05 +0100 Message-Id: <1453827425-16455-6-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1453827425-16455-1-git-send-email-zajec5@gmail.com> References: <1453827425-16455-1-git-send-email-zajec5@gmail.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Broadcom ARM routers BCM4366 cards are available with 14e4:4365 ID. Unfortunately this ID was already used by Broadcom for cards with BCM43142, a totally different chipset requiring SoftMAC driver. To avoid a conflict between brcmfmac and bcma use more specific ID entry with subvendor and subdevice specified. Signed-off-by: Rafa? Mi?ecki --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c index 0480b70..d5f9ef4 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c @@ -1951,6 +1951,9 @@ static const struct dev_pm_ops brcmf_pciedrvr_pm = { #define BRCMF_PCIE_DEVICE(dev_id) { BRCM_PCIE_VENDOR_ID_BROADCOM, dev_id,\ PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, 0 } +#define BRCMF_PCIE_DEVICE_SUB(dev_id, subvend, subdev) { \ + BRCM_PCIE_VENDOR_ID_BROADCOM, dev_id,\ + subvend, subdev, PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, 0 } static struct pci_device_id brcmf_pcie_devid_table[] = { BRCMF_PCIE_DEVICE(BRCM_PCIE_4350_DEVICE_ID), @@ -1966,6 +1969,7 @@ static struct pci_device_id brcmf_pcie_devid_table[] = { BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_DEVICE_ID), BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_2G_DEVICE_ID), BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_5G_DEVICE_ID), + BRCMF_PCIE_DEVICE_SUB(0x4365, BRCM_PCIE_VENDOR_ID_BROADCOM, 0x4365), 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),