From: Bo Jiao <bo.jiao@mediatek.com> To: Felix Fietkau <nbd@nbd.name> Cc: linux-wireless <linux-wireless@vger.kernel.org>, Ryder Lee <ryder.lee@mediatek.com>, Xing Song <xing.song@mediatek.com>, Sujuan Chen <sujuan.chen@mediatek.com>, Shayne Chen <shayne.chen@mediatek.com>, "Evelyn Tsai" <evelyn.tsai@mediatek.com>, linux-mediatek <linux-mediatek@lists.infradead.org>, Bo Jiao <Bo.Jiao@mediatek.com> Subject: [PATCH v3 11/11] mt76: mt7915: add device id for mt7916 Date: Tue, 23 Nov 2021 15:49:55 +0800 [thread overview] Message-ID: <156e5d70ac787efde597351b904e9b3610e01da3.1637652742.git.Bo.Jiao@mediatek.com> (raw) In-Reply-To: <cover.1637652742.git.Bo.Jiao@mediatek.com> From: Bo Jiao <Bo.Jiao@mediatek.com> Add pci_device_id to enable mt7916. Note that MT_HW_CHIPID is no longer used for further chips, so drop it accordingly. Co-developed-by: Sujuan Chen <sujuan.chen@mediatek.com> Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com> Co-developed-by: Ryder Lee <ryder.lee@mediatek.com> Signed-off-by: Ryder Lee <ryder.lee@mediatek.com> Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com> --- drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7915/pci.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c index 7ba5b1f..d463b3c 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c @@ -534,7 +534,7 @@ static int mt7915_mmio_init(struct mt76_dev *mdev, bus_ops->rmw = mt7915_rmw; dev->mt76.bus = bus_ops; - mdev->rev = (mt76_rr(dev, MT_HW_CHIPID) << 16) | + mdev->rev = (device_id << 16) | (mt76_rr(dev, MT_HW_REV) & 0xff); dev_dbg(mdev->dev, "ASIC revision: %04x\n", mdev->rev); diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/pci.c b/drivers/net/wireless/mediatek/mt76/mt7915/pci.c index 3134b46..8d1a811 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/pci.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/pci.c @@ -18,11 +18,13 @@ static u32 hif_idx; static const struct pci_device_id mt7915_pci_device_table[] = { { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7915) }, + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7906) }, { }, }; static const struct pci_device_id mt7915_hif_device_table[] = { { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7916) }, + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x790a) }, { }, }; @@ -61,7 +63,8 @@ static void mt7915_put_hif2(struct mt7915_hif *hif) static struct mt7915_hif *mt7915_pci_init_hif2(struct pci_dev *pdev) { hif_idx++; - if (!pci_get_device(PCI_VENDOR_ID_MEDIATEK, 0x7916, NULL)) + if (!pci_get_device(PCI_VENDOR_ID_MEDIATEK, 0x7916, NULL) && + !pci_get_device(PCI_VENDOR_ID_MEDIATEK, 0x790a, NULL)) return NULL; writel(hif_idx | MT_PCIE_RECOG_ID_SEM, @@ -112,7 +115,7 @@ static int mt7915_pci_probe(struct pci_dev *pdev, mt76_pci_disable_aspm(pdev); - if (id->device == 0x7916) + if (id->device == 0x7916 || id->device == 0x790a) return mt7915_pci_hif2_probe(pdev); ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES); -- 2.18.0
WARNING: multiple messages have this Message-ID (diff)
From: Bo Jiao <bo.jiao@mediatek.com> To: Felix Fietkau <nbd@nbd.name> Cc: linux-wireless <linux-wireless@vger.kernel.org>, Ryder Lee <ryder.lee@mediatek.com>, Xing Song <xing.song@mediatek.com>, Sujuan Chen <sujuan.chen@mediatek.com>, Shayne Chen <shayne.chen@mediatek.com>, "Evelyn Tsai" <evelyn.tsai@mediatek.com>, linux-mediatek <linux-mediatek@lists.infradead.org>, Bo Jiao <Bo.Jiao@mediatek.com> Subject: [PATCH v3 11/11] mt76: mt7915: add device id for mt7916 Date: Tue, 23 Nov 2021 15:49:55 +0800 [thread overview] Message-ID: <156e5d70ac787efde597351b904e9b3610e01da3.1637652742.git.Bo.Jiao@mediatek.com> (raw) In-Reply-To: <cover.1637652742.git.Bo.Jiao@mediatek.com> From: Bo Jiao <Bo.Jiao@mediatek.com> Add pci_device_id to enable mt7916. Note that MT_HW_CHIPID is no longer used for further chips, so drop it accordingly. Co-developed-by: Sujuan Chen <sujuan.chen@mediatek.com> Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com> Co-developed-by: Ryder Lee <ryder.lee@mediatek.com> Signed-off-by: Ryder Lee <ryder.lee@mediatek.com> Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com> --- drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7915/pci.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c index 7ba5b1f..d463b3c 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c @@ -534,7 +534,7 @@ static int mt7915_mmio_init(struct mt76_dev *mdev, bus_ops->rmw = mt7915_rmw; dev->mt76.bus = bus_ops; - mdev->rev = (mt76_rr(dev, MT_HW_CHIPID) << 16) | + mdev->rev = (device_id << 16) | (mt76_rr(dev, MT_HW_REV) & 0xff); dev_dbg(mdev->dev, "ASIC revision: %04x\n", mdev->rev); diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/pci.c b/drivers/net/wireless/mediatek/mt76/mt7915/pci.c index 3134b46..8d1a811 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/pci.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/pci.c @@ -18,11 +18,13 @@ static u32 hif_idx; static const struct pci_device_id mt7915_pci_device_table[] = { { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7915) }, + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7906) }, { }, }; static const struct pci_device_id mt7915_hif_device_table[] = { { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7916) }, + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x790a) }, { }, }; @@ -61,7 +63,8 @@ static void mt7915_put_hif2(struct mt7915_hif *hif) static struct mt7915_hif *mt7915_pci_init_hif2(struct pci_dev *pdev) { hif_idx++; - if (!pci_get_device(PCI_VENDOR_ID_MEDIATEK, 0x7916, NULL)) + if (!pci_get_device(PCI_VENDOR_ID_MEDIATEK, 0x7916, NULL) && + !pci_get_device(PCI_VENDOR_ID_MEDIATEK, 0x790a, NULL)) return NULL; writel(hif_idx | MT_PCIE_RECOG_ID_SEM, @@ -112,7 +115,7 @@ static int mt7915_pci_probe(struct pci_dev *pdev, mt76_pci_disable_aspm(pdev); - if (id->device == 0x7916) + if (id->device == 0x7916 || id->device == 0x790a) return mt7915_pci_hif2_probe(pdev); ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES); -- 2.18.0 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek
next prev parent reply other threads:[~2021-11-23 7:50 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-11-23 7:49 [PATCH v3 00/11] add mt7916 support Bo Jiao 2021-11-23 7:49 ` Bo Jiao 2021-11-23 7:49 ` [PATCH v3 01/11] mt76: mt7915: add mt7915_mmio_probe() as a common probing function Bo Jiao 2021-11-23 7:49 ` Bo Jiao 2021-11-23 7:49 ` [PATCH v3 02/11] mt76: mt7915: refine register definition Bo Jiao 2021-11-23 7:49 ` Bo Jiao 2021-12-01 12:05 ` Felix Fietkau 2021-12-01 12:05 ` Felix Fietkau 2021-11-23 7:49 ` [PATCH v3 03/11] mt76: mt7915: rework dma.c to adapt mt7916 changes Bo Jiao 2021-11-23 7:49 ` Bo Jiao 2021-12-01 12:36 ` Felix Fietkau 2021-12-01 12:36 ` Felix Fietkau 2021-11-23 7:49 ` [PATCH v3 04/11] mt76: mt7915: add firmware support for mt7916 Bo Jiao 2021-11-23 7:49 ` Bo Jiao 2021-11-23 7:49 ` [PATCH v3 05/11] mt76: mt7915: rework eeprom.c to adapt mt7916 changes Bo Jiao 2021-11-23 7:49 ` Bo Jiao 2021-11-23 7:49 ` [PATCH v3 06/11] mt76: mt7915: enlarge wcid size to 544 Bo Jiao 2021-11-23 7:49 ` Bo Jiao 2021-11-23 7:49 ` [PATCH v3 07/11] mt76: mt7915: add txfree event v3 Bo Jiao 2021-11-23 7:49 ` Bo Jiao 2021-11-23 7:49 ` [PATCH v3 08/11] mt76: mt7915: update rx rate reporting for mt7916 Bo Jiao 2021-11-23 7:49 ` Bo Jiao 2021-12-01 12:40 ` Felix Fietkau 2021-12-01 12:40 ` Felix Fietkau 2021-11-23 7:49 ` [PATCH v3 09/11] mt76: mt7915: update mt7915_chan_mib_offs " Bo Jiao 2021-11-23 7:49 ` Bo Jiao 2021-11-23 7:49 ` [PATCH v3 10/11] mt76: mt7915: add mt7916 calibrated data support Bo Jiao 2021-11-23 7:49 ` Bo Jiao 2021-11-23 7:49 ` Bo Jiao [this message] 2021-11-23 7:49 ` [PATCH v3 11/11] mt76: mt7915: add device id for mt7916 Bo Jiao
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=156e5d70ac787efde597351b904e9b3610e01da3.1637652742.git.Bo.Jiao@mediatek.com \ --to=bo.jiao@mediatek.com \ --cc=evelyn.tsai@mediatek.com \ --cc=linux-mediatek@lists.infradead.org \ --cc=linux-wireless@vger.kernel.org \ --cc=nbd@nbd.name \ --cc=ryder.lee@mediatek.com \ --cc=shayne.chen@mediatek.com \ --cc=sujuan.chen@mediatek.com \ --cc=xing.song@mediatek.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: linkBe 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.