blob: 9c922d69412ba0e1c26a38e24c9c93fb4c273127 [file] [log] [blame]
developera46f6132024-03-26 14:09:54 +08001From 22607765799dad52bcf304ffd5f393878c4317bf Mon Sep 17 00:00:00 2001
developerbd9fa1e2023-10-16 11:04:00 +08002From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
3Date: Thu, 20 Jul 2023 17:27:22 +0800
developera46f6132024-03-26 14:09:54 +08004Subject: [PATCH 10/17] mtk: wifi: mt76: mt7996: add eagle default bin of
developer1a173672023-12-21 14:49:33 +08005 different sku variants
developerbd9fa1e2023-10-16 11:04:00 +08006
7Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
8---
9 mt7996/eeprom.c | 2 ++
10 mt7996/init.c | 4 ++++
11 mt7996/mt7996.h | 28 ++++++++++++++++++++++++++--
12 3 files changed, 32 insertions(+), 2 deletions(-)
13
14diff --git a/mt7996/eeprom.c b/mt7996/eeprom.c
developer1a173672023-12-21 14:49:33 +080015index 4a823711..7505a8b7 100644
developerbd9fa1e2023-10-16 11:04:00 +080016--- a/mt7996/eeprom.c
17+++ b/mt7996/eeprom.c
developer1a173672023-12-21 14:49:33 +080018@@ -26,6 +26,8 @@ static char *mt7996_eeprom_name(struct mt7996_dev *dev)
19 {
20 switch (mt76_chip(&dev->mt76)) {
21 case 0x7990:
22+ if (dev->chip_sku == MT7996_SKU_404)
23+ return MT7996_EEPROM_DEFAULT_404;
developerbd9fa1e2023-10-16 11:04:00 +080024 return MT7996_EEPROM_DEFAULT;
developer1a173672023-12-21 14:49:33 +080025 case 0x7992:
26 return MT7992_EEPROM_DEFAULT;
developerbd9fa1e2023-10-16 11:04:00 +080027diff --git a/mt7996/init.c b/mt7996/init.c
developer753619c2024-02-22 13:42:45 +080028index 9aa97e4a..274863dc 100644
developerbd9fa1e2023-10-16 11:04:00 +080029--- a/mt7996/init.c
30+++ b/mt7996/init.c
developereb155692024-01-11 14:08:37 +080031@@ -897,6 +897,10 @@ static int mt7996_init_hardware(struct mt7996_dev *dev)
developer1a173672023-12-21 14:49:33 +080032 INIT_LIST_HEAD(&dev->wed_rro.poll_list);
33 spin_lock_init(&dev->wed_rro.lock);
developerbd9fa1e2023-10-16 11:04:00 +080034
35+ ret = mt7996_get_chip_sku(dev);
36+ if (ret)
37+ return ret;
38+
developer1a173672023-12-21 14:49:33 +080039 ret = mt7996_dma_init(dev);
40 if (ret)
41 return ret;
developerbd9fa1e2023-10-16 11:04:00 +080042diff --git a/mt7996/mt7996.h b/mt7996/mt7996.h
developer753619c2024-02-22 13:42:45 +080043index 36d1f247..b6df2167 100644
developerbd9fa1e2023-10-16 11:04:00 +080044--- a/mt7996/mt7996.h
45+++ b/mt7996/mt7996.h
developer1a173672023-12-21 14:49:33 +080046@@ -40,6 +40,7 @@
47 #define MT7992_ROM_PATCH "mediatek/mt7996/mt7992_rom_patch.bin"
developerbd9fa1e2023-10-16 11:04:00 +080048
49 #define MT7996_EEPROM_DEFAULT "mediatek/mt7996/mt7996_eeprom.bin"
50+#define MT7996_EEPROM_DEFAULT_404 "mediatek/mt7996/mt7996_eeprom_dual_404.bin"
developer1a173672023-12-21 14:49:33 +080051 #define MT7992_EEPROM_DEFAULT "mediatek/mt7996/mt7992_eeprom.bin"
developerbd9fa1e2023-10-16 11:04:00 +080052 #define MT7996_EEPROM_SIZE 7680
53 #define MT7996_EEPROM_BLOCK_SIZE 16
developer1a173672023-12-21 14:49:33 +080054@@ -88,6 +89,11 @@ struct mt7996_sta;
developerbd9fa1e2023-10-16 11:04:00 +080055 struct mt7996_dfs_pulse;
56 struct mt7996_dfs_pattern;
57
58+enum mt7996_sku_type {
59+ MT7996_SKU_404,
60+ MT7996_SKU_444,
61+};
62+
63 enum mt7996_ram_type {
64 MT7996_RAM_TYPE_WM,
developer1a173672023-12-21 14:49:33 +080065 MT7996_RAM_TYPE_WA,
66@@ -257,6 +263,8 @@ struct mt7996_dev {
developerbd9fa1e2023-10-16 11:04:00 +080067 struct cfg80211_chan_def rdd2_chandef;
68 struct mt7996_phy *rdd2_phy;
69
70+ u8 chip_sku;
71+
72 u16 chainmask;
73 u8 chainshift[__MT_MAX_BAND];
74 u32 hif_idx;
developer753619c2024-02-22 13:42:45 +080075@@ -398,6 +406,23 @@ mt7996_phy3(struct mt7996_dev *dev)
developerbd9fa1e2023-10-16 11:04:00 +080076 return __mt7996_phy(dev, MT_BAND2);
77 }
78
79+static inline int
80+mt7996_get_chip_sku(struct mt7996_dev *dev)
81+{
82+ u32 val = mt76_rr(dev, MT_PAD_GPIO);
83+
84+ /* reserve for future variants */
85+ switch (mt76_chip(&dev->mt76)) {
86+ case 0x7990:
87+ dev->chip_sku = FIELD_GET(MT_PAD_GPIO_ADIE_COMB, val) <= 1;
88+ break;
89+ default:
90+ return -EINVAL;
91+ }
92+
93+ return 0;
94+}
95+
96 static inline bool
97 mt7996_band_valid(struct mt7996_dev *dev, u8 band)
98 {
developer753619c2024-02-22 13:42:45 +080099@@ -405,8 +430,7 @@ mt7996_band_valid(struct mt7996_dev *dev, u8 band)
developerbd9fa1e2023-10-16 11:04:00 +0800100 return band <= MT_BAND1;
101
102 /* tri-band support */
103- if (band <= MT_BAND2 &&
104- mt76_get_field(dev, MT_PAD_GPIO, MT_PAD_GPIO_ADIE_COMB) <= 1)
105+ if (band <= MT_BAND2 && dev->chip_sku)
106 return true;
107
108 return band == MT_BAND0 || band == MT_BAND2;
109--
1102.18.0
111