wifi: mt76: mt7921: get rid of eeprom.h
authorLorenzo Bianconi <lorenzo@kernel.org>
Mon, 3 Apr 2023 10:33:59 +0000 (12:33 +0200)
committerFelix Fietkau <nbd@nbd.name>
Mon, 17 Apr 2023 15:30:01 +0000 (17:30 +0200)
eeprom.h is mostly empty for mt7921, so get rid of it.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c
drivers/net/wireless/mediatek/mt76/mt7921/eeprom.h [deleted file]
drivers/net/wireless/mediatek/mt76/mt7921/init.c
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h

index 29d8883..d6b6edb 100644 (file)
@@ -2,7 +2,6 @@
 /* Copyright (C) 2020 MediaTek Inc. */
 
 #include "mt7921.h"
-#include "eeprom.h"
 
 static int
 mt7921_reg_set(void *data, u64 val)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/eeprom.h b/drivers/net/wireless/mediatek/mt76/mt7921/eeprom.h
deleted file mode 100644 (file)
index 4b64727..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/* SPDX-License-Identifier: ISC */
-/* Copyright (C) 2020 MediaTek Inc. */
-
-#ifndef __MT7921_EEPROM_H
-#define __MT7921_EEPROM_H
-
-#include "mt7921.h"
-
-enum mt7921_eeprom_field {
-       MT_EE_CHIP_ID =         0x000,
-       MT_EE_VERSION =         0x002,
-       MT_EE_MAC_ADDR =        0x004,
-       MT_EE_WIFI_CONF =       0x07c,
-       MT_EE_HW_TYPE =         0x55b,
-       __MT_EE_MAX =           0x9ff
-};
-
-#define MT_EE_WIFI_CONF_TX_MASK                        BIT(0)
-#define MT_EE_WIFI_CONF_BAND_SEL               GENMASK(3, 2)
-
-#define MT_EE_HW_TYPE_ENCAP                    BIT(0)
-
-enum mt7921_eeprom_band {
-       MT_EE_NA,
-       MT_EE_5GHZ,
-       MT_EE_2GHZ,
-       MT_EE_DUAL_BAND,
-};
-
-#endif
index 33681fb..f419f90 100644 (file)
@@ -6,7 +6,6 @@
 #include "mt7921.h"
 #include "mac.h"
 #include "mcu.h"
-#include "eeprom.h"
 
 static const struct ieee80211_iface_limit if_limits[] = {
        {
index c5e7ad0..601d5aa 100644 (file)
@@ -5,7 +5,6 @@
 #include <linux/firmware.h>
 #include "mt7921.h"
 #include "mt7921_trace.h"
-#include "eeprom.h"
 #include "mcu.h"
 #include "mac.h"
 
index f3155d4..149acb1 100644 (file)
@@ -266,6 +266,17 @@ struct mt7921_phy {
        bool roc_grant;
 };
 
+enum mt7921_eeprom_field {
+       MT_EE_CHIP_ID =         0x000,
+       MT_EE_VERSION =         0x002,
+       MT_EE_MAC_ADDR =        0x004,
+       MT_EE_WIFI_CONF =       0x07c,
+       MT_EE_HW_TYPE =         0x55b,
+       __MT_EE_MAX =           0x9ff
+};
+
+#define MT_EE_HW_TYPE_ENCAP                    BIT(0)
+
 #define mt7921_init_reset(dev)         ((dev)->hif_ops->init_reset(dev))
 #define mt7921_dev_reset(dev)          ((dev)->hif_ops->reset(dev))
 #define mt7921_mcu_init(dev)           ((dev)->hif_ops->mcu_init(dev))